diff options
author | Andrew Tridgell <tridge@samba.org> | 1997-10-30 08:13:32 +0000 |
---|---|---|
committer | Andrew Tridgell <tridge@samba.org> | 1997-10-30 08:13:32 +0000 |
commit | e950ec72c4297bf2e0e494a4b29b291233316786 (patch) | |
tree | 516ea600e103d4d7772383dbda6d3a5e5295bc09 | |
parent | 5b62eeed08d675201d92c26ad5d2f52d5c94f2fa (diff) | |
download | rsync-e950ec72c4297bf2e0e494a4b29b291233316786.tar.gz rsync-e950ec72c4297bf2e0e494a4b29b291233316786.tar.bz2 rsync-e950ec72c4297bf2e0e494a4b29b291233316786.zip |
don't use WRAP as that maybe be defined in standard includes
-rw-r--r-- | lib/zlib.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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;} -#define WRAP {if(q==s->end&&s->read!=s->window){q=s->window;m=WAVAIL;}} +#define ZWRAP {if(q==s->end&&s->read!=s->window){q=s->window;m=WAVAIL;}} #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 ZWRAP if(m==0) LEAVE}}r=Z_OK;} #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 */ -/* WRAP */ /* expand WRAP macro by hand to handle s->read */ +/* ZWRAP */ /* expand ZWRAP macro by hand to handle s->read */ if (q == s->end) { s->read = q = s->window; m = WAVAIL; |