Commit ec62685345654cba50f3985c4ca44ce0e641d83c

Vicent Marti 2011-07-01T17:34:27

zlib: Declare preprocessor directives at build time

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 42f81a7..4a7117b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -70,7 +70,7 @@ IF (WIN32 AND NOT CYGWIN)
 	FILE(GLOB SRC src/*.c src/win32/*.c)
 ENDIF ()
 
-ADD_DEFINITIONS(-D_FILE_OFFSET_BITS=64)
+ADD_DEFINITIONS(-D_FILE_OFFSET_BITS=64 -DNO_VIZ -DSTDC -DNO_GZIP)
 
 # Compile and link libgit2
 ADD_LIBRARY(git2 ${SRC} ${SRC_ZLIB})
diff --git a/deps/zlib/zconf.h b/deps/zlib/zconf.h
index 683cba8..1508143 100644
--- a/deps/zlib/zconf.h
+++ b/deps/zlib/zconf.h
@@ -10,10 +10,6 @@
 
 #include "../../src/common.h"
 
-#define NO_GZIP
-#define STDC
-#define NO_VIZ
-
 /* Jeez, don't complain about non-prototype
  * forms, we didn't write zlib */
 #if defined(_MSC_VER)