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 f6a075104619c58aa20d37283945e4f1dfe38f7d..1415c44225c108776ed79fac2e9ea74b50b7f310 100644 (file)
--- a/src/zlib/zutil.h
+++ b/src/zlib/zutil.h
@@ -208,12 +208,14 @@ 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));
 typedef uLong (ZEXPORT _Optlink *check_func) OF((uLong check, const Bytef *buf,
                                       uInt len));

-#if defined(__VISAGECPP__)

 voidpf _Optlink zcalloc OF((voidpf opaque, unsigned items, unsigned size));
 void  _Optlink zcfree OF((voidpf opaque, voidpf ptr));
 #else
 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));
 #endif
 voidpf zcalloc OF((voidpf opaque, unsigned items, unsigned size));
 void   zcfree  OF((voidpf opaque, voidpf ptr));
 #endif