diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-08-28 17:00:58 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-08-28 17:00:58 +0300 |
| commit | 4b2f615d6960aed2bef3b17c04a390cfdda31347 (patch) | |
| tree | 46c7f1bee6132602a63c4b88d2a131d6ab149d77 /include | |
| parent | aa5601eee6924fb2ac358f5ee072b422a804ed1c (diff) | |
| download | mariadb-git-4b2f615d6960aed2bef3b17c04a390cfdda31347.tar.gz | |
Portability fixes for windows
include/config-win.h:
Portability fix for windows
include/my_global.h:
General portability fix
sql/mysqld.cc:
Portability fix for windows
sql/set_var.cc:
Portability fix for windows
sql/sql_yacc.yy:
Portability fix for windows
Diffstat (limited to 'include')
| -rw-r--r-- | include/config-win.h | 1 | ||||
| -rw-r--r-- | include/my_global.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/config-win.h b/include/config-win.h index c0d0dad894e..f51713623ef 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -259,6 +259,7 @@ inline double ulonglong2double(ulonglong value) #define HAVE_ISNAN #define HAVE_FINITE #define HAVE_ISAM /* We want to have support for ISAM in 4.0 */ +#define SPRINTF_RETURNS_INT #ifdef NOT_USED #define HAVE_SNPRINTF /* Gave link error */ diff --git a/include/my_global.h b/include/my_global.h index e65e803c335..8524328a47b 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -1016,7 +1016,7 @@ typedef union { #ifdef SPRINTF_RETURNS_PTR #define my_sprintf(buff,args) ((int)(sprintf args - buff)) #else -#define my_sprintf(buff,args) sprintf args,strlen(buff) +#define my_sprintf(buff,args) ((ulong) sprintf args, (ulong) strlen(buff)) #endif #endif |