Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5b62eee
)
don't use WRAP as that maybe be defined in standard includes
author
Andrew Tridgell
<tridge@samba.org>
Thu, 30 Oct 1997 08:13:32 +0000
(08:13 +0000)
committer
Andrew Tridgell
<tridge@samba.org>
Thu, 30 Oct 1997 08:13:32 +0000
(08:13 +0000)
lib/zlib.c
patch
|
blob
|
blame
|
history
diff --git
a/lib/zlib.c
b/lib/zlib.c
index
82e82c7
..
c9f7ff5
100644
(file)
--- a/
lib/zlib.c
+++ b/
lib/zlib.c
@@
-3089,9
+3089,9
@@
struct inflate_blocks_state {
/* output bytes */
#define WAVAIL (q<s->read?s->read-q-1:s->end-q)
#define LOADOUT {q=s->write;m=WAVAIL;}
/* output bytes */
#define WAVAIL (q<s->read?s->read-q-1:s->end-q)
#define LOADOUT {q=s->write;m=WAVAIL;}
-#define WRAP {if(q==s->end&&s->read!=s->window){q=s->window;m=WAVAIL;}}
+#define
Z
WRAP {if(q==s->end&&s->read!=s->window){q=s->window;m=WAVAIL;}}
#define FLUSH {UPDOUT r=inflate_flush(s,z,r); LOADOUT}
#define FLUSH {UPDOUT r=inflate_flush(s,z,r); LOADOUT}
-#define NEEDOUT {if(m==0){
WRAP if(m==0){FLUSH
WRAP if(m==0) LEAVE}}r=Z_OK;}
+#define NEEDOUT {if(m==0){
ZWRAP if(m==0){FLUSH Z
WRAP if(m==0) LEAVE}}r=Z_OK;}
#define OUTBYTE(a) {*q++=(Byte)(a);m--;}
/* load local pointers */
#define LOAD {LOADIN LOADOUT}
#define OUTBYTE(a) {*q++=(Byte)(a);m--;}
/* load local pointers */
#define LOAD {LOADIN LOADOUT}
@@
-3552,7
+3552,7
@@
z_stream *z;
n -= t;
z->total_out += t;
s->read = q; /* drag read pointer forward */
n -= t;
z->total_out += t;
s->read = q; /* drag read pointer forward */
-/*
WRAP */ /* expand
WRAP macro by hand to handle s->read */
+/*
ZWRAP */ /* expand Z
WRAP macro by hand to handle s->read */
if (q == s->end) {
s->read = q = s->window;
m = WAVAIL;
if (q == s->end) {
s->read = q = s->window;
m = WAVAIL;