bk commit into 5.0 tree (gkodinov:1.2599) BUG#33907

[kgeorge]

Below is the list of changes that have just been committed into a local
5.0 repository of gkodinov.  When gkodinov 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-03-14 19:01:02+02:00, gkodinov@stripped +3 -0
  Bug #33907: Errors compiling mysql with Microsoft Visual C++ Express 2008
  
  Fixed and ammended various #ifdefs to allow compiling with the above 
  compiler.

  CMakeLists.txt@stripped, 2008-03-14 19:01:01+02:00, gkodinov@stripped +8 -4
    Bug #33907: make MySQL compile on VC++ 2008

  include/config-win.h@stripped, 2008-03-14 19:01:01+02:00, gkodinov@stripped +3 -0
    Bug #33907: make MySQL compile on VC++ 2008

  zlib/zutil.h@stripped, 2008-03-14 19:01:01+02:00, gkodinov@stripped +2 -1
    Bug #33907: make MySQL compile on VC++ 2008

diff -Nrup a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt	2007-11-02 21:16:44 +02:00
+++ b/CMakeLists.txt	2008-03-14 19:01:01 +02:00
@@ -78,17 +78,20 @@ SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CM
 SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DDBUG_OFF")
 SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -DDBUG_OFF")
 
-IF(CMAKE_GENERATOR MATCHES "Visual Studio 8")
+IF(CMAKE_GENERATOR MATCHES "Visual Studio 8" OR
+   CMAKE_GENERATOR MATCHES "Visual Studio 9")
     SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /wd4996")
     SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /wd4996")
     SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /wd4996")
     SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /wd4996")
     SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /wd4996")
     SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} /wd4996")
-ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 8")
+ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 8" OR
+      CMAKE_GENERATOR MATCHES "Visual Studio 9")
 
 IF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR 
-   CMAKE_GENERATOR MATCHES "Visual Studio 8")
+   CMAKE_GENERATOR MATCHES "Visual Studio 8" OR
+   CMAKE_GENERATOR MATCHES "Visual Studio 9")
 
     # replace /MDd with /MTd
     STRING(REPLACE "/MD"  "/MT"  CMAKE_C_FLAGS_RELEASE          ${CMAKE_C_FLAGS_RELEASE})
@@ -121,7 +124,8 @@ IF(CMAKE_GENERATOR MATCHES "Visual Studi
     ENDIF(NOT tmp_manifest)
 
 ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR 
-      CMAKE_GENERATOR MATCHES "Visual Studio 8")
+      CMAKE_GENERATOR MATCHES "Visual Studio 8" OR
+      CMAKE_GENERATOR MATCHES "Visual Studio 9")
 
 ADD_DEFINITIONS("-D_WINDOWS -D__WIN__ -D_CRT_SECURE_NO_DEPRECATE")
 
diff -Nrup a/include/config-win.h b/include/config-win.h
--- a/include/config-win.h	2007-10-23 16:48:54 +03:00
+++ b/include/config-win.h	2008-03-14 19:01:01 +02:00
@@ -28,6 +28,9 @@ functions */
 /* Avoid endless warnings about sprintf() etc. being unsafe. */
 #define _CRT_SECURE_NO_DEPRECATE 1
 #endif
+#if defined(_MSC_VER) && _MSC_VER >= 1500
+#define _CRT_NONSTDC_NO_WARNINGS 1
+#endif
 
 #include <sys/locking.h>
 #include <windows.h>
diff -Nrup a/zlib/zutil.h b/zlib/zutil.h
--- a/zlib/zutil.h	2005-09-22 01:17:45 +03:00
+++ b/zlib/zutil.h	2008-03-14 19:01:01 +02:00
@@ -175,7 +175,8 @@ extern const char * const z_errmsg[10]; 
 
          /* functions */
 
-#if defined(STDC99) || (defined(__TURBOC__) && __TURBOC__ >= 0x550)
+#if defined(STDC99) || (defined(__TURBOC__) && __TURBOC__ >= 0x550) ||  \
+  defined(_MSC_VER) && _MSC_VER >= 1500
 #  ifndef HAVE_VSNPRINTF
 #    define HAVE_VSNPRINTF
 #  endif