diff options
| author | monty@mysql.com <> | 2005-04-29 17:03:34 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2005-04-29 17:03:34 +0300 |
| commit | fbf31c4a8c68419c689c52c031a98275755a0961 (patch) | |
| tree | 0caae1ad50324015508cbda7e4ef72f92ca69c25 /include | |
| parent | 948fce01b3ec235c2e8e3b40f660f327a836abe8 (diff) | |
| download | mariadb-git-fbf31c4a8c68419c689c52c031a98275755a0961.tar.gz | |
CAST(string_argument AS UNSIGNED) didn't work for big integers above the signed range. (Bug #7036)
Produce warnings of wrong cast of strings to signed/unsigned.
Don't block not resolved IP's if DNS server is down (Bug #8467)
Fix compiler problems with MinGW (Bug #8872)
Diffstat (limited to 'include')
| -rw-r--r-- | include/config-win.h | 17 | ||||
| -rw-r--r-- | include/my_global.h | 2 |
2 files changed, 17 insertions, 2 deletions
diff --git a/include/config-win.h b/include/config-win.h index 472190e53ca..b3865c1fda7 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -106,20 +106,33 @@ functions */ /* Type information */ +#if defined(__EMX__) || !defined(HAVE_UINT) +#undef HAVE_UINT +#define HAVE_UINT typedef unsigned short ushort; typedef unsigned int uint; +#endif /* defined(__EMX__) || !defined(HAVE_UINT) */ + typedef unsigned __int64 ulonglong; /* Microsofts 64 bit types */ typedef __int64 longlong; +#ifndef HAVE_SIGSET_T typedef int sigset_t; +#endif #define longlong_defined -/* off_t should not be __int64 because of conflicts in header files; - Use my_off_t or os_off_t instead */ +/* + off_t should not be __int64 because of conflicts in header files; + Use my_off_t or os_off_t instead +*/ +#ifndef HAVE_OFF_T typedef long off_t; +#endif typedef __int64 os_off_t; #ifdef _WIN64 typedef UINT_PTR rf_SetTimer; #else +#ifndef HAVE_SIZE_T typedef unsigned int size_t; +#endif typedef uint rf_SetTimer; #endif diff --git a/include/my_global.h b/include/my_global.h index 745179e8a06..bf6f3b52c4b 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -393,6 +393,8 @@ int __void__; #endif #if defined(__EMX__) || !defined(HAVE_UINT) +#undef HAVE_UINT +#define HAVE_UINT typedef unsigned int uint; typedef unsigned short ushort; #endif |