1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

dbug/dbug.c: unused variable removed

Browse Source 
include/config-win.h: SIZEOF_INT
include/my_global.h: win64 fix
support-files/Makefile.am: automake magic
This commit is contained in:
serg@janus.mylan 2007-03-17 11:19:21 +01:00
parent 5a5bcc741b
commit e9fb4a686f
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dbug/dbug.c
View File

@ -2000,7 +2000,6 @@ static char *DbugMalloc(size_t size)
static const char *DbugStrTok(const char *s) static const char *DbugStrTok(const char *s)
{ {
const char *start=s;
while (s[0] && (s[0] != ':' || while (s[0] && (s[0] != ':' ||
(s[1] == '\\' || s[1] == '/' || (s[1] == ':' && s++)))) (s[1] == '\\' || s[1] == '/' || (s[1] == ':' && s++))))
s++; s++;

1
include/config-win.h
View File

@ -172,6 +172,7 @@ typedef uint rf_SetTimer;
#endif #endif
#define VOID_SIGHANDLER #define VOID_SIGHANDLER
#define SIZEOF_CHAR 1 #define SIZEOF_CHAR 1
#define SIZEOF_INT 4
#define SIZEOF_LONG 4 #define SIZEOF_LONG 4
#define SIZEOF_LONG_LONG 8 #define SIZEOF_LONG_LONG 8
#define SIZEOF_OFF_T 8 #define SIZEOF_OFF_T 8

4
include/my_global.h
View File

@ -1020,8 +1020,10 @@ typedef unsigned long long my_ulonglong;
typedef int intptr; typedef int intptr;
#elif SIZEOF_CHARP == SIZEOF_LONG #elif SIZEOF_CHARP == SIZEOF_LONG
typedef long intptr; typedef long intptr;
#elif SIZEOF_CHARP == SIZEOF_LONG_LONG
typedef long long intptr;
#else #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 #endif
#ifdef USE_RAID #ifdef USE_RAID

2
support-files/Makefile.am
View File

@ -26,7 +26,7 @@ EXTRA_DIST = mysql.spec.sh \
mysql-log-rotate.sh \ mysql-log-rotate.sh \
mysql.server.sh \ mysql.server.sh \
binary-configure.sh \ binary-configure.sh \
magic \ magic mysql.m4 \
MySQL-shared-compat.spec.sh \ MySQL-shared-compat.spec.sh \
ndb-config-2-node.ini.sh \ ndb-config-2-node.ini.sh \
compiler_warnings.supp compiler_warnings.supp