Changed #ifdef DEBUG to #ifdef __WXDEBUG__

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@257 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/zlib/deflate.h b/src/zlib/deflate.h
index 6273d3976c5347c029cc830f200bedffdcca4a3c..04830164dd65702fdffa907c424ff34637f05870 100644 (file)
--- a/src/zlib/deflate.h
+++ b/src/zlib/deflate.h
@@ -234,7 +234,7 @@ typedef struct internal_state {
     uInt matches;       /* number of string matches in current block */
     int last_eob_len;   /* bit length of EOB code for last block */
 
-#ifdef WXDEBUG
+#ifdef DEBUG
     ulg bits_sent;      /* bit length of the compressed data */
 #endif
 
@@ -281,7 +281,7 @@ void _tr_stored_block OF((deflate_state *s, charf *buf, ulg stored_len,
  * used.
  */
 
-#ifndef WXDEBUG
+#ifndef DEBUG
 /* Inline versions of _tr_tally for speed: */
 
 #if defined(GEN_TREES_H) || !defined(STDC)

diff --git a/src/zlib/trees.c b/src/zlib/trees.c
index ef31043764b6ff857991283a57a989945126cbf1..24c68cb580375d7c142b998f66a815e4106595df 100644 (file)
--- a/src/zlib/trees.c
+++ b/src/zlib/trees.c
@@ -35,7 +35,7 @@
 
 #include "deflate.h"
 
-#ifdef DEBUG
+#ifdef __WXDEBUG__
 #  include <ctype.h>
 #endif
 
@@ -163,11 +163,11 @@ local void copy_block     OF((deflate_state *s, charf *buf, unsigned len,
 local void gen_trees_header OF((void));
 #endif
 
-#ifndef DEBUG
+#ifndef __WXDEBUG__
 #  define send_code(s, c, tree) send_bits(s, tree[c].Code, tree[c].Len)
    /* Send a code of the given tree. c and tree must not have side effects */
 
-#else /* DEBUG */
+#else /* __WXDEBUG__ */
 #  define send_code(s, c, tree) \
      { if (z_verbose>2) fprintf(stderr,"\ncd %3d ",(c)); \
        send_bits(s, tree[c].Code, tree[c].Len); }
@@ -186,7 +186,7 @@ local void gen_trees_header OF((void));
  * Send a value on a given number of bits.
  * IN assertion: length <= 16 and value fits in length bits.
  */
-#ifdef DEBUG
+#ifdef __WXDEBUG__
 local void send_bits      OF((deflate_state *s, int value, int length));
 
 local void send_bits(s, value, length)
@@ -212,7 +212,7 @@ local void send_bits(s, value, length)
         s->bi_valid += length;
     }
 }
-#else /* !DEBUG */
+#else /* !__WXDEBUG__ */
 
 #define send_bits(s, value, length) \
 { int len = length;\
@@ -227,7 +227,7 @@ local void send_bits(s, value, length)
     s->bi_valid += len;\
   }\
 }
-#endif /* DEBUG */
+#endif /* __WXDEBUG__ */
 
 
 #define MAX(a,b) (a >= b ? a : b)
@@ -313,7 +313,7 @@ local void tr_static_init()
  * Genererate the file trees.h describing the static trees.
  */
 #ifdef GEN_TREES_H
-#  ifndef DEBUG
+#  ifndef __WXDEBUG__
 #    include <stdio.h>
 #  endif
 
@@ -392,7 +392,7 @@ void _tr_init(s)
     s->bi_buf = 0;
     s->bi_valid = 0;
     s->last_eob_len = 8; /* enough lookahead for inflate */
-#ifdef DEBUG
+#ifdef __WXDEBUG__
     s->bits_sent = 0L;
 #endif
 
@@ -1182,7 +1182,7 @@ local void bi_windup(s)
     }
     s->bi_buf = 0;
     s->bi_valid = 0;
-#ifdef DEBUG
+#ifdef __WXDEBUG__
     s->bits_sent = (s->bits_sent+7) & ~7;
 #endif
 }
@@ -1203,11 +1203,11 @@ local void copy_block(s, buf, len, header)
     if (header) {
         put_short(s, (ush)len);   
         put_short(s, (ush)~len);
-#ifdef DEBUG
+#ifdef __WXDEBUG__
         s->bits_sent += 2*16;
 #endif
     }
-#ifdef DEBUG
+#ifdef __WXDEBUG__
     s->bits_sent += (ulg)len<<3;
 #endif
     while (len--) {

diff --git a/src/zlib/zutil.c b/src/zlib/zutil.c
index 5a3fe6e0a5d6c2d716d6d441a9219bf89f496b64..199762bdbe584558040ae31990d318bb0df7a5db 100644 (file)
--- a/src/zlib/zutil.c
+++ b/src/zlib/zutil.c
@@ -31,7 +31,7 @@ const char * ZEXPORT zlibVersion()
     return ZLIB_VERSION;
 }
 
-#ifdef DEBUG
+#ifdef __WXDEBUG__
 
 #  ifndef verbose
 #    define verbose 0

diff --git a/src/zlib/zutil.h b/src/zlib/zutil.h
index e6a07d2e64faaee357c4aee22002693eb94c2514..06543084cd6d5690a9ea4032d7a7ae08b83be085 100644 (file)
--- a/src/zlib/zutil.h
+++ b/src/zlib/zutil.h
@@ -29,7 +29,7 @@
 #ifndef local
 #  define local static
 #endif
-/* compile with -Dlocal if your debugger can't find static symbols */
+/* compile with -Dlocal if your __WXDEBUG__ger can't find static symbols */
 
 typedef unsigned char  uch;
 typedef uch FAR uchf;
@@ -188,7 +188,7 @@ extern const char *z_errmsg[10]; /* indexed by 2-zlib_error */
 #endif
 
 /* Diagnostic functions */
-#ifdef WXDEBUG
+#ifdef __WXDEBUG__
 #  include <stdio.h>
    extern int z_verbose;
    extern void z_error    OF((char *m));