[Mobies-commit] [commit] r3950 - in UDM/trunk/src: Udm UdmBase

[ksmyth at redhat1.isis.vanderbilt.edu]

Author: ksmyth
Date: Fri Nov 18 11:01:47 2011
New Revision: 3950

Log:
#define ZLIB_WINAPI under x64 according to zlib/contrib/vstudio/readme.txt

Modified:
   UDM/trunk/src/Udm/Udm.cpp
   UDM/trunk/src/UdmBase/Project.cpp

Modified: UDM/trunk/src/Udm/Udm.cpp
==============================================================================
--- UDM/trunk/src/Udm/Udm.cpp	Fri Nov 18 10:20:30 2011	(r3949)
+++ UDM/trunk/src/Udm/Udm.cpp	Fri Nov 18 11:01:47 2011	(r3950)
@@ -20,7 +20,10 @@
 
 #include "./JavaAPIGen/JavaAPIGen.h"
 
-#ifdef WIN32
+#ifdef _WIN32
+#if defined(_M_AMD64)
+#define ZLIB_WINAPI
+#endif
 #include <contrib\minizip\unzip.h>
 #else
 #include <minizip/unzip.h>

Modified: UDM/trunk/src/UdmBase/Project.cpp
==============================================================================
--- UDM/trunk/src/UdmBase/Project.cpp	Fri Nov 18 10:20:30 2011	(r3949)
+++ UDM/trunk/src/UdmBase/Project.cpp	Fri Nov 18 11:01:47 2011	(r3950)
@@ -57,6 +57,9 @@
 #include <UdmStatic.h>
 
 //zip 
+#if defined(_M_AMD64)
+#define ZLIB_WINAPI
+#endif
 #include <zlib.h>
 
 #ifdef WIN32