summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorunknown <knielsen@mysql.com>2006-01-05 23:39:45 +0100
committerunknown <knielsen@mysql.com>2006-01-05 23:39:45 +0100
commitf6bcc388da522c4428d47ab023a4556dd4930e8f (patch)
tree3703d2f78eea0ebbf04a563376fe7fd13b2f373e /include
parenta6b0029f4d446adc730b09206b9cd838b0da3f7c (diff)
downloadmariadb-git-f6bcc388da522c4428d47ab023a4556dd4930e8f.tar.gz
Port to Win64/x64 in Visual Studio 2005
include/config-win.h: Port to Win64/x64 in Visual Studio 2005. Avoid endless deprecation warnings.
Diffstat (limited to 'include')
-rw-r--r--include/config-win.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/include/config-win.h b/include/config-win.h
index 528bc8a8cdd..cebc4c8b82b 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() */
@@ -325,6 +330,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 */