diff options
| author | unknown <knielsen@mysql.com> | 2006-01-05 23:41:10 +0100 |
|---|---|---|
| committer | unknown <knielsen@mysql.com> | 2006-01-05 23:41:10 +0100 |
| commit | f133b06567c459ad299cf16c38b5d3655abe1266 (patch) | |
| tree | c5bee2f036e7090d67f045458c763c3b0f155b84 /include/config-win.h | |
| parent | 724f46c2d00344efbf216a57272ea4c746221a9d (diff) | |
| parent | f6bcc388da522c4428d47ab023a4556dd4930e8f (diff) | |
| download | mariadb-git-f133b06567c459ad299cf16c38b5d3655abe1266.tar.gz | |
Merge mysql.com:/usr/local/mysql/mysql-5.0-win-fixes
into mysql.com:/usr/local/mysql/mysql-5.0
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 b825d34f1ee..53483f3f39d 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() */ @@ -329,6 +334,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 */ |