bzr push into mysql-5.1 branch (stewart:2838 to 2839)

[Stewart Smith]

 2839 Stewart Smith	2008-09-11 [merge]
      merge HAVE_VSNPRINTF workaround for zlib on VS2008
modified:
  CMakeLists.txt

 2838 Stewart Smith	2008-09-08 [merge]
      merge from win32 working branch
modified:
  storage/ndb/src/kernel/blocks/ndbfs/Win32AsyncFile.cpp

=== modified file 'CMakeLists.txt'
--- a/CMakeLists.txt	2008-09-04 05:47:01 +0000
+++ b/CMakeLists.txt	2008-09-09 09:00:03 +0000
@@ -183,6 +183,14 @@ IF(WIN32)
   ADD_DEFINITIONS("-D_WINDOWS -D__WIN__ -D_CRT_SECURE_NO_DEPRECATE")
 ENDIF(WIN32)
 
+IF(CMAKE_GENERATOR MATCHES "Visual Studio 9")
+  # Fool zlib on Win32 with VS9
+  # It just includes config.h, which we don't have on win32.. so we have to
+  # do it here alongside config-win.h.
+  ADD_DEFINITIONS("-DHAVE_VSNPRINTF")
+ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 9")
+
+
 # This definition is necessary to work around a bug with Intellisense described
 # here: http://tinyurl.com/2cb428.  Syntax highlighting is important for proper
 # debugger functionality.