1. don't delete item attributes in the virtual list control (=> crash)

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

diff --git a/src/zlib/zutil.h b/src/zlib/zutil.h
index 5e403d1d78985f1348514fc7b82588e10db08d0a..1415c44225c108776ed79fac2e9ea74b50b7f310 100644 (file)
--- a/src/zlib/zutil.h
+++ b/src/zlib/zutil.h
@@ -13,7 +13,7 @@
 #ifndef _Z_UTIL_H
 #define _Z_UTIL_H
 
 #ifndef _Z_UTIL_H
 #define _Z_UTIL_H
 

-#include "zlib.h"
+#include "../zlib/zlib.h"

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


@@ -188,7 +188,7 @@ extern const char *z_errmsg[10]; /* indexed by 2-zlib_error */
 #endif
 
 /* Diagnostic functions */
 #endif
 
 /* Diagnostic functions */

-#ifdef DEBUG
+#ifdef __WXDEBUG__

 #  include <stdio.h>
    extern int z_verbose;
    extern void z_error    OF((char *m));
 #  include <stdio.h>
    extern int z_verbose;
    extern void z_error    OF((char *m));


@@ -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))