diff options
| author | unknown <knielsen@mysql.com> | 2006-01-05 23:45:52 +0100 |
|---|---|---|
| committer | unknown <knielsen@mysql.com> | 2006-01-05 23:45:52 +0100 |
| commit | cdd75f06aa174961a0877bb1a5fd631ac9abf0f4 (patch) | |
| tree | fc49be77fa3b0de19cd08b09913f78a4f5150c55 /include/config-win.h | |
| parent | b6670685d1af258060274000b76c42d537668276 (diff) | |
| parent | f6bcc388da522c4428d47ab023a4556dd4930e8f (diff) | |
| download | mariadb-git-cdd75f06aa174961a0877bb1a5fd631ac9abf0f4.tar.gz | |
Merge mysql.com:/usr/local/mysql/mysql-5.0-win-fixes
into mysql.com:/usr/local/mysql/mysql-5.1-new
include/config-win.h:
Auto merged
Diffstat (limited to 'include/config-win.h')
| -rw-r--r-- | include/config-win.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/config-win.h b/include/config-win.h index 6c0937391fb..a08e25ed628 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -22,6 +22,11 @@ functions */ #define _WIN32_WINNT 0x0500 #endif +#if defined(_MSC_VER) && _MSC_VER >= 1400 +/* Avoid endless warnings about sprintf() etc. being unsafe. */ +#define _CRT_SECURE_NO_DEPRECATE 1 +#endif + #include <sys/locking.h> #include <windows.h> #include <math.h> /* Because of rint() */ @@ -341,6 +346,11 @@ inline double ulonglong2double(ulonglong value) #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 #define FILE_SHARE_DELETE 0 /* Not implemented on Win 98/ME */ |