fixed wxUniv/GTK linking by getting rid of GENERICOBJS and putting them into GUIOBJS...

[wxWidgets.git] / src / zlib / zutil.h

diff --git a/src/zlib/zutil.h b/src/zlib/zutil.h
index 06543084cd6d5690a9ea4032d7a7ae08b83be085..1415c44225c108776ed79fac2e9ea74b50b7f310 100644 (file)
--- a/src/zlib/zutil.h
+++ b/src/zlib/zutil.h
@@ -29,7 +29,7 @@
 #ifndef local
 #  define local static
 #endif
 #ifndef local
 #  define local static
 #endif

-/* compile with -Dlocal if your __WXDEBUG__ger can't find static symbols */
+/* compile with -Dlocal if your debugger can't find static symbols */

 
 typedef unsigned char  uch;
 typedef uch FAR uchf;
 
 typedef unsigned char  uch;
 typedef uch FAR uchf;


@@ -208,10 +208,17 @@ extern const char *z_errmsg[10]; /* indexed by 2-zlib_error */
 #endif
 
 
 #endif
 
 

+#if defined(__VISAGECPP__)
+typedef uLong (ZEXPORT _Optlink *check_func) OF((uLong check, const Bytef *buf,
+                                      uInt len));
+voidpf _Optlink zcalloc OF((voidpf opaque, unsigned items, unsigned size));
+void  _Optlink zcfree OF((voidpf opaque, voidpf ptr));
+#else

 typedef uLong (ZEXPORT *check_func) OF((uLong check, const Bytef *buf,
                                       uInt len));
 voidpf zcalloc OF((voidpf opaque, unsigned items, unsigned size));
 void   zcfree  OF((voidpf opaque, voidpf ptr));
 typedef uLong (ZEXPORT *check_func) OF((uLong check, const Bytef *buf,
                                       uInt len));
 voidpf zcalloc OF((voidpf opaque, unsigned items, unsigned size));
 void   zcfree  OF((voidpf opaque, voidpf ptr));

+#endif

 
 #define ZALLOC(strm, items, size) \
            (*((strm)->zalloc))((strm)->opaque, (items), (size))
 
 #define ZALLOC(strm, items, size) \
            (*((strm)->zalloc))((strm)->opaque, (items), (size))