diff options
| author | monty@donna.mysql.com <> | 2000-08-15 20:09:37 +0300 |
|---|---|---|
| committer | monty@donna.mysql.com <> | 2000-08-15 20:09:37 +0300 |
| commit | ea013c2152301e459504451efdb17f4c9bb30877 (patch) | |
| tree | 5f72e7444fbc3c8d944a66b54b26550a04e4f0be /include/config-win.h | |
| parent | 807460bbceceec25bf97352bc5e232c3e766d70f (diff) | |
| download | mariadb-git-ea013c2152301e459504451efdb17f4c9bb30877.tar.gz | |
Fixed for Ia64 + delayed key creation + a lot of small bug fixes
Diffstat (limited to 'include/config-win.h')
| -rw-r--r-- | include/config-win.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/include/config-win.h b/include/config-win.h index 3a541e9ca88..399b28bbe24 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -85,9 +85,6 @@ typedef unsigned short ushort; typedef unsigned int uint; -#ifndef _WIN64 -typedef unsigned int size_t; -#endif typedef unsigned __int64 ulonglong; /* Microsofts 64 bit types */ typedef __int64 longlong; typedef int sigset_t; @@ -96,6 +93,12 @@ typedef int sigset_t; Use my_off_t or os_off_t instead */ typedef long off_t; typedef __int64 os_off_t; +#ifdef _WIN64 +typedef UINT_PTR rf_SetTimer; +#else +typedef unsigned int size_t; +typedef uint rf_SetTimer; +#endif #define Socket_defined #define my_socket SOCKET @@ -288,4 +291,3 @@ inline double ulonglong2double(ulonglong value) #define statistic_add(V,C,L) (V)+=(C) #endif #define statistic_increment(V,L) thread_safe_increment((V),(L)) - |