diff options
| author | unknown <knielsen@mysql.com> | 2006-01-12 09:18:34 +0100 |
|---|---|---|
| committer | unknown <knielsen@mysql.com> | 2006-01-12 09:18:34 +0100 |
| commit | 5818d5481df0599fc688c0a7da832c27d55ae77f (patch) | |
| tree | e2999bf03afa0ddc73e7b354b8ff3e02b4618533 /include | |
| parent | 633d3592bb67d2a0d3e1fdf0c31197db8d2078a4 (diff) | |
| download | mariadb-git-5818d5481df0599fc688c0a7da832c27d55ae77f.tar.gz | |
Merge changeset 1.2031.1.1 06/01/11 16:18:11 reggie@linux.site into 5.1.5-alpha release clone
include/config-win.h:
Merge compile fixes from 5.0 into 5.1.5-alpha release clone.
Diffstat (limited to 'include')
| -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 a08e25ed628..2de75385d4d 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 */ @@ -345,11 +351,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 |