bk commit into 5.0 tree (reggie:1.2032)

[reggie]

Below is the list of changes that have just been committed into a local
5.0 repository of reggie. When reggie 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.2032 06/01/11 16:18:11 reggie@stripped +1 -0
  simple Windows compile fixes.

  include/config-win.h
    1.74 06/01/11 16:18:00 reggie@stripped +11 -9
    use the ll and ull postfix codes for create longlong and ulonglong
    symbols.  This allows ULL(a) and LL(a) to be used in more complex
    macro definitions than the previous definitions.  This may work on
    other compilers but we just tested on Visual 7.1 and 8.0
    
    Also, define HAVE_STRNLEN for all windows platforms.  Our own strnlen
    offers no performance improvements over the CRT version.

# 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:	reggie
# Host:	linux.site
# Root:	/home/reggie/work/mysql-5.0

--- 1.73/include/config-win.h	2006-01-05 16:41:05 -06:00
+++ 1.74/include/config-win.h	2006-01-11 16:18:00 -06:00
@@ -108,11 +108,17 @@
 #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 @@
 #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