Fix Cygwin and MinGW compilation

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

diff --git a/src/common/unzip.h b/src/common/unzip.h
index 9907959c55b8b0e0401816631125ece475afd2ce..78dee0ee4df3be71335c5581d85e2067a7cc3116 100644 (file)
--- a/src/common/unzip.h
+++ b/src/common/unzip.h
@@ -1,3 +1,10 @@
+/*
+
+This file was altered for needs of wxWindows.
+$Id$
+
+*/
+
 /* unzip.h -- IO for uncompress .zip files using zlib
    Version 0.15 beta, Mar 19th, 1998,
 
@@ -46,7 +53,16 @@ extern "C" {
 #endif
 
 #ifndef _ZLIB_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
 #endif
 
 #if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
@@ -268,8 +284,8 @@ extern int ZEXPORT unzGetLocalExtrafield OF((unzFile file,
        the error code
 */
 
-#if defined(__VISAGECPP__)
-//Visualage complains of no prototypes
+#if defined(__VISAGECPP__) || defined(__BORLANDC__)
+/*Visualage complains of no prototypes*/
 int unzlocal_getByte(FILE* , int*);
 int strcmpcasenosensitive_internal (const char*, const char*);
 int unzlocal_getShort (FILE*, uLong*);