bk commit into 5.1 tree (Reggie:1.2652)

[reggie]

Below is the list of changes that have just been committed into a local
5.1 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@stripped, 2008-01-22 10:20:01-06:00, Reggie@core. +1 -0
  Visual Studio 9 defines vsnprintf so we don't need to redefine it

  zlib/zutil.h@stripped, 2008-01-22 10:19:53-06:00, Reggie@core. +1 -1
    Visual Studio 9 defines vsnprintf so we don't need to redefine it

diff -Nrup a/zlib/zutil.h b/zlib/zutil.h
--- a/zlib/zutil.h	2005-09-21 17:17:45 -05:00
+++ b/zlib/zutil.h	2008-01-22 10:19:53 -06:00
@@ -194,7 +194,7 @@ extern const char * const z_errmsg[10]; 
 #  ifdef __TURBOC__
 #    define NO_vsnprintf
 #  endif
-#  ifdef WIN32
+#  if defined(WIN32) && (!defined(_MSC_VER) || _MSC_VER < 1500)
      /* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */
 #    if !defined(vsnprintf) && !defined(NO_vsnprintf)
 #      define vsnprintf _vsnprintf