dbug/dbug.c: unused variable removed
include/config-win.h: SIZEOF_INT include/my_global.h: win64 fix support-files/Makefile.am: automake magic
This commit is contained in:
parent
5a5bcc741b
commit
e9fb4a686f
@ -2000,7 +2000,6 @@ static char *DbugMalloc(size_t size)
|
||||
|
||||
static const char *DbugStrTok(const char *s)
|
||||
{
|
||||
const char *start=s;
|
||||
while (s[0] && (s[0] != ':' ||
|
||||
(s[1] == '\\' || s[1] == '/' || (s[1] == ':' && s++))))
|
||||
s++;
|
||||
|
@ -172,6 +172,7 @@ typedef uint rf_SetTimer;
|
||||
#endif
|
||||
#define VOID_SIGHANDLER
|
||||
#define SIZEOF_CHAR 1
|
||||
#define SIZEOF_INT 4
|
||||
#define SIZEOF_LONG 4
|
||||
#define SIZEOF_LONG_LONG 8
|
||||
#define SIZEOF_OFF_T 8
|
||||
|
@ -1020,8 +1020,10 @@ typedef unsigned long long my_ulonglong;
|
||||
typedef int intptr;
|
||||
#elif SIZEOF_CHARP == SIZEOF_LONG
|
||||
typedef long intptr;
|
||||
#elif SIZEOF_CHARP == SIZEOF_LONG_LONG
|
||||
typedef long long intptr;
|
||||
#else
|
||||
#error sizeof(void *) is neither sizeof(int) nor sizeof(long)
|
||||
#error sizeof(void *) is neither sizeof(int) nor sizeof(long) nor sizeof(long long)
|
||||
#endif
|
||||
|
||||
#ifdef USE_RAID
|
||||
|
@ -26,7 +26,7 @@ EXTRA_DIST = mysql.spec.sh \
|
||||
mysql-log-rotate.sh \
|
||||
mysql.server.sh \
|
||||
binary-configure.sh \
|
||||
magic \
|
||||
magic mysql.m4 \
|
||||
MySQL-shared-compat.spec.sh \
|
||||
ndb-config-2-node.ini.sh \
|
||||
compiler_warnings.supp
|
||||
|
Loading…
x
Reference in New Issue
Block a user