Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed #ifdef DEBUG to #ifdef __WXDEBUG__

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@257 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Karsten Ballüder
1998-07-13 14:11:22 +00:00
parent 70bb5dba34
commit c6cdbc3d75
4 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/zlib/deflate.h
View File

@@ -234,7 +234,7 @@ typedef struct internal_state {
uInt matches; /* number of string matches in current block */ uInt matches; /* number of string matches in current block */
int last_eob_len; /* bit length of EOB code for last 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 */ ulg bits_sent; /* bit length of the compressed data */
#endif #endif
@@ -281,7 +281,7 @@ void _tr_stored_block OF((deflate_state *s, charf *buf, ulg stored_len,
* used. * used.
*/ */
#ifndef WXDEBUG #ifndef DEBUG
/* Inline versions of _tr_tally for speed: */ /* Inline versions of _tr_tally for speed: */
#if defined(GEN_TREES_H) || !defined(STDC) #if defined(GEN_TREES_H) || !defined(STDC)

22
src/zlib/trees.c
View File

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

2
src/zlib/zutil.c
View File

@@ -31,7 +31,7 @@ const char * ZEXPORT zlibVersion()
return ZLIB_VERSION; return ZLIB_VERSION;
} }
#ifdef DEBUG #ifdef __WXDEBUG__
# ifndef verbose # ifndef verbose
# define verbose 0 # define verbose 0

4
src/zlib/zutil.h
View File

@@ -29,7 +29,7 @@
#ifndef local #ifndef local
# define local static # define local static
#endif #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 unsigned char uch;
typedef uch FAR uchf; typedef uch FAR uchf;
@@ -188,7 +188,7 @@ extern const char *z_errmsg[10]; /* indexed by 2-zlib_error */
#endif #endif
/* Diagnostic functions */ /* Diagnostic functions */
#ifdef WXDEBUG #ifdef __WXDEBUG__
# include <stdio.h> # include <stdio.h>
extern int z_verbose; extern int z_verbose;
extern void z_error OF((char *m)); extern void z_error OF((char *m));