Bug 226733 build bustage fix.

git-svn-id: svn://10.0.0.236/trunk@158057 18797224-902f-48f8-a5cc-f745e15eee43
2004-06-17 21:48:01 +00:00
parent c37310b6c2
commit 4614ab3b23
2 changed files with 9 additions and 0 deletions
--- a/mozilla/modules/zlib/src/ChangeLog.moz
+++ b/mozilla/modules/zlib/src/ChangeLog.moz
@@ -7,3 +7,6 @@ Mozilla.org changes:

 - 17 June 2004
  Add mozzconf.h
+
+- 17 June 2004
+  Turn off ZLIB_DLL to fix static build bustage
--- a/mozilla/modules/zlib/src/mozzconf.h
+++ b/mozilla/modules/zlib/src/mozzconf.h
@@ -37,6 +37,12 @@
 #ifndef MOZZCONF_H
 #define MOZZCONF_H

+#ifdef XP_WIN
+#ifdef ZLIB_DLL
+#undef ZLIB_DLL
+#endif
+#endif
+
 /* Symbols from zlib.def */
 #define zlibVersion MOZ_Z_zlibVersion
 #define deflate MOZ_Z_deflate