bk commit into 5.1 tree (knielsen:1.2041)

[knielsen]

Below is the list of changes that have just been committed into a local
5.1 repository of knielsen. When knielsen does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2041 06/01/05 23:45:52 knielsen@stripped +1 -0
  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
    1.75 06/01/05 23:45:45 knielsen@stripped +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	knielsen
# Host:	rt.int.sifira.dk
# Root:	/usr/local/mysql/mysql-5.1-new/RESYNC

--- 1.74/include/config-win.h	2006-01-04 22:36:21 +01:00
+++ 1.75/include/config-win.h	2006-01-05 23:45:45 +01:00
@@ -22,6 +22,11 @@
 #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() */
@@ -340,6 +345,11 @@
 #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