some conflicts resolved

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

diff --git a/src/common/unzip.c b/src/common/unzip.c
index 5d279124531ff93ea1c10211f21fc2ade97ac662..54ced0c33b4b20dd1e3adc318d540eb8b7686b58 100644 (file)
--- a/src/common/unzip.c
+++ b/src/common/unzip.c
@@ -4,7 +4,9 @@
    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
@@ -136,7 +138,7 @@ typedef struct
 } unz_s;
 
 #if defined (__VISAGECPP__)
-// VA always requires prototypes
+/* VA always requires prototypes */
 int unzlocal_CheckCurrentFileCoherencyHeader (unz_s*, uInt*, uLong*, uInt*);
 #endif
 
@@ -1308,7 +1310,7 @@ extern int ZEXPORT unzGetGlobalComment (file, szComment, uSizeBuf)
 
 #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;
 
-#endif // wxUSE_ZLIB && wxUSE_ZIPSTREAM
+#endif /* wxUSE_ZLIB && wxUSE_ZIPSTREAM */