Unicode overview added

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

diff --git a/src/common/unzip.c b/src/common/unzip.c
index 5e4a178bfad4624bc863c18c447d84b1fe28dfad..54ced0c33b4b20dd1e3adc318d540eb8b7686b58 100644 (file)
--- a/src/common/unzip.c
+++ b/src/common/unzip.c
@@ -4,6 +4,9 @@
    Read unzip.h for more info
 */
 
    Read unzip.h for more info
 */
 

+#if !defined(__VISAGECPP__)
+#   pragma warning(disable:4001)    /* non standard extension used: single line comment */
+#endif

 #include "wx/setup.h"
 
 #if wxUSE_ZLIB && wxUSE_ZIPSTREAM
 #include "wx/setup.h"
 
 #if wxUSE_ZLIB && wxUSE_ZIPSTREAM


@@ -12,7 +15,13 @@
 #include <stdlib.h>
 #include <string.h>
 #include "zlib.h"
 #include <stdlib.h>
 #include <string.h>
 #include "zlib.h"

+
+/* Not the right solution (paths in makefiles) but... */
+#ifdef __BORLANDC__
+#include "../common/unzip.h"
+#else

 #include "unzip.h"
 #include "unzip.h"

+#endif

 
 #ifdef STDC
 #  include <stddef.h>
 
 #ifdef STDC
 #  include <stddef.h>


@@ -129,7 +138,7 @@ typedef struct
 } unz_s;
 
 #if defined (__VISAGECPP__)
 } unz_s;
 
 #if defined (__VISAGECPP__)

-// VA always requires prototypes
+/* VA always requires prototypes */

 int unzlocal_CheckCurrentFileCoherencyHeader (unz_s*, uInt*, uLong*, uInt*);
 #endif
 
 int unzlocal_CheckCurrentFileCoherencyHeader (unz_s*, uInt*, uLong*, uInt*);
 #endif
 


@@ -1301,7 +1310,7 @@ extern int ZEXPORT unzGetGlobalComment (file, szComment, uSizeBuf)
 
 #else
 
 
 #else
 

-// the file shouldn't be empty, som compilers don't like it
+/* the file shouldn't be empty, som compilers don't like it */

 static const int dummyVariableInUnzip = 17;
 
 static const int dummyVariableInUnzip = 17;
 

-#endif // wxUSE_ZLIB && wxUSE_ZIPSTREAM
+#endif /* wxUSE_ZLIB && wxUSE_ZIPSTREAM */