diff options
| author | reggie@linux.site <> | 2006-01-11 16:18:11 -0600 |
|---|---|---|
| committer | reggie@linux.site <> | 2006-01-11 16:18:11 -0600 |
| commit | 8de137a3aa3c1e6d072665c350bb46415e94219f (patch) | |
| tree | 3119c2ea71a76c4df83cffb1c399fd67c3eee226 /include/config-win.h | |
| parent | 5182d404120b0175de0e4cedcb1ea2bdcea3ebe2 (diff) | |
| download | mariadb-git-8de137a3aa3c1e6d072665c350bb46415e94219f.tar.gz | |
simple Windows compile fixes.
Diffstat (limited to 'include/config-win.h')
| -rw-r--r-- | include/config-win.h | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/include/config-win.h b/include/config-win.h index 53483f3f39d..b2bd63efc30 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -108,11 +108,17 @@ functions */ #undef _REENTRANT /* Crashes something for win32 */ #undef SAFE_MUTEX /* Can't be used on windows */ -#define LONGLONG_MIN ((__int64) 0x8000000000000000) -#define LONGLONG_MAX ((__int64) 0x7FFFFFFFFFFFFFFF) -#define ULONGLONG_MAX ((unsigned __int64) 0xFFFFFFFFFFFFFFFF) -#define LL(A) ((__int64) A) -#define ULL(A) ((unsigned __int64) A) +#if defined(_MSC_VER) && _MSC_VER >= 1310 +#define LL(A) A##ll +#define ULL(A) A##ull +#else +#define LL(A) ((__int64) A) +#define ULL(A) ((unsigned __int64) A) +#endif + +#define LONGLONG_MIN LL(0x8000000000000000) +#define LONGLONG_MAX LL(0x7FFFFFFFFFFFFFFF) +#define ULONGLONG_MAX ULL(0xFFFFFFFFFFFFFFFF) /* Type information */ @@ -333,11 +339,7 @@ inline double ulonglong2double(ulonglong value) #define SPRINTF_RETURNS_INT #define HAVE_SETFILEPOINTER #define HAVE_VIO_READ_BUFF - -#if defined(_WIN64) && defined(_M_X64) -/* Avoid type conflicts with built-in functions. */ #define HAVE_STRNLEN -#endif #ifndef __NT__ #undef FILE_SHARE_DELETE |