added wx/defs.h include to correct compilation issues under Mac OS X

[wxWidgets.git] / src / common / unzip.c

diff --git a/src/common/unzip.c b/src/common/unzip.c
index 551b1c6b2d78394eb3be4f5d8bef730dd6e58baa..02a37dc16c5f4d02923baec9ed5ee167a0ec5124 100644 (file)
--- a/src/common/unzip.c
+++ b/src/common/unzip.c
@@ -21,7 +21,19 @@ $Id$
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

+/*

 #include "zlib.h"
 #include "zlib.h"

+ normally, the compiler options should contain -I../zlib, but it is
+ apparently not the case for all MSW makefiles and so, unless we use
+ configure (which defines __WX_SETUP_H__) or it is explicitly overridden by
+ the user (who can define wxUSE_ZLIB_H_IN_PATH), we hardcode the path here
+*/
+#if defined(__WXMSW__) && !defined(__WX_SETUP_H__) && !defined(wxUSE_ZLIB_H_IN_PATH)
+   #include "../zlib/zlib.h"
+#else
+   #include "zlib.h"
+#endif
+

 
 /* Not the right solution (paths in makefiles) but... */
 #ifdef __BORLANDC__
 
 /* Not the right solution (paths in makefiles) but... */
 #ifdef __BORLANDC__