diff options
| author | Vladislav Vaintroub <vvaintroub@mysql.com> | 2009-11-25 15:20:14 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <vvaintroub@mysql.com> | 2009-11-25 15:20:14 +0100 |
| commit | 53cc3b7bf817f77124f31affb9e33de205e7528f (patch) | |
| tree | e06536a82dab9f0549416006195fc1371ff528db /include/config-win.h | |
| parent | 2f3e777797a643284ffdd0f31c820497097ab451 (diff) | |
| parent | 0a9d4e675ad3b176909d30c5a6aa8ab1f0b7186b (diff) | |
| download | mariadb-git-53cc3b7bf817f77124f31affb9e33de205e7528f.tar.gz | |
merge
Diffstat (limited to 'include/config-win.h')
| -rw-r--r-- | include/config-win.h | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/include/config-win.h b/include/config-win.h index 364c4f92134..431bfcfa702 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -145,10 +145,21 @@ typedef __int64 os_off_t; #ifdef _WIN64 typedef UINT_PTR rf_SetTimer; #else +typedef uint rf_SetTimer; +#endif + #ifndef HAVE_SIZE_T -typedef unsigned int size_t; +#ifndef _SIZE_T_DEFINED +typedef SIZE_T size_t; +#define _SIZE_T_DEFINED +#endif +#endif + +#ifndef HAVE_SSIZE_T +#ifndef _SSIZE_T_DEFINED +typedef SSIZE_T ssize_t; +#define _SSIZE_T_DEFINED #endif -typedef uint rf_SetTimer; #endif #define Socket_defined |