diff options
| author | unknown <reggie@linux.site> | 2006-01-11 16:34:51 -0600 |
|---|---|---|
| committer | unknown <reggie@linux.site> | 2006-01-11 16:34:51 -0600 |
| commit | 7c215273851720f6e439aacac34e70b8f09d4bc1 (patch) | |
| tree | e62dc32792789f836d4ac0f808b730e543e55cc7 /include | |
| parent | c6993d67be04f438514ef05823214795d8a59c9a (diff) | |
| parent | 65bffb0f6dbb2f034c327d68b5bc49cc2125dd61 (diff) | |
| download | mariadb-git-7c215273851720f6e439aacac34e70b8f09d4bc1.tar.gz | |
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0
into linux.site:/home/reggie/work/mysql-5.0
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 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 |