diff options
| -rw-r--r-- | dbug/dbug.c | 1 | ||||
| -rw-r--r-- | include/config-win.h | 1 | ||||
| -rw-r--r-- | include/my_global.h | 4 | ||||
| -rw-r--r-- | support-files/Makefile.am | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/dbug/dbug.c b/dbug/dbug.c index c4ae89f837f..e482fd95073 100644 --- a/dbug/dbug.c +++ b/dbug/dbug.c @@ -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++; diff --git a/include/config-win.h b/include/config-win.h index 6735ae1aba1..fadf24c732f 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -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 diff --git a/include/my_global.h b/include/my_global.h index addc2f24e7f..b6c6ff13405 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -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 diff --git a/support-files/Makefile.am b/support-files/Makefile.am index b3ef3b77b76..b3581d65eb0 100644 --- a/support-files/Makefile.am +++ b/support-files/Makefile.am @@ -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 |