From: Vladislav Vaintroub
Date: February 11 2009 3:40pm
Subject: bzr commit into mysql-6.0-bugteam branch (vvaintroub:3043)
List-Archive: http://lists.mysql.com/commits/65925
Message-Id: <0KEW00ASLRJUO720@fe-emea-10.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7BIT

#At file:///G:/bzr/mysql-6.0-bugteam/ based on revid:vvaintroub@stripped

 3043 Vladislav Vaintroub	2009-02-11
      Fix broken build on Windows :
      - Fix INCLUDE_DIRECTORIES for comp_err in CMakeLists.txt (should include zlib)
      - also fix some warnings
modified:
  extra/CMakeLists.txt
  extra/comp_err.c

=== modified file 'extra/CMakeLists.txt'
--- a/extra/CMakeLists.txt	2008-12-12 07:48:03 +0000
+++ b/extra/CMakeLists.txt	2009-02-11 15:40:20 +0000
@@ -15,10 +15,10 @@
 INCLUDE("${PROJECT_SOURCE_DIR}/win/mysql_manifest.cmake")
 
 
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/zlib)
 
 ADD_EXECUTABLE(comp_err comp_err.c)
-TARGET_LINK_LIBRARIES(comp_err dbug mysys strings zlib)
+TARGET_LINK_LIBRARIES(comp_err zlib)
 
 GET_TARGET_PROPERTY(COMP_ERR_EXE comp_err LOCATION)
 
@@ -46,9 +46,6 @@ TARGET_LINK_LIBRARIES(perror strings mys
 ADD_EXECUTABLE(resolveip resolveip.c)
 TARGET_LINK_LIBRARIES(resolveip strings mysys dbug)
 
-ADD_EXECUTABLE(resolveip resolveip.c)
-TARGET_LINK_LIBRARIES(resolveip strings mysys debug dbug wsock32)
-
 ADD_EXECUTABLE(replace replace.c)
 TARGET_LINK_LIBRARIES(replace strings mysys dbug)
 

=== modified file 'extra/comp_err.c'
--- a/extra/comp_err.c	2009-01-29 21:40:17 +0000
+++ b/extra/comp_err.c	2009-02-11 15:40:20 +0000
@@ -58,6 +58,8 @@
 #include <sys/stat.h>
 #ifndef _WIN32
 #include <unistd.h>
+#else
+#include <direct.h> /* mkdir */
 #endif
 
 #include <errno.h>
@@ -796,7 +798,7 @@ static unsigned long checksum_format_spe
       case 'u':
       case 'x':
       case 's':
-        chksum= crc32(chksum, start, p - start);
+        chksum= crc32(chksum, start, (uInt)(p - start));
         start= 0; /* Not in format specifier anymore */
         break;