diff options
author | Andrew Tridgell <tridge@samba.org> | 1998-05-22 13:02:22 +0000 |
---|---|---|
committer | Andrew Tridgell <tridge@samba.org> | 1998-05-22 13:02:22 +0000 |
commit | 9add51f18ec5f753ba77b2011eae980eba4a0be5 (patch) | |
tree | 60716ace1f40462b33be7fbf3618dd7c6cea1f3c /zlib | |
parent | f7bd44eb32a5d7a8313e6cc96a1e9b197c1a8c01 (diff) | |
download | rsync-9add51f18ec5f753ba77b2011eae980eba4a0be5.tar.gz rsync-9add51f18ec5f753ba77b2011eae980eba4a0be5.tar.bz2 rsync-9add51f18ec5f753ba77b2011eae980eba4a0be5.zip |
change WRAP to ZWRAP so it doesn't conflict with IRIX includes
Diffstat (limited to 'zlib')
-rw-r--r-- | zlib/infutil.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/zlib/infutil.h b/zlib/infutil.h index 99d1135d..bc96d111 100644 --- a/zlib/infutil.h +++ b/zlib/infutil.h @@ -77,9 +77,9 @@ struct inflate_blocks_state { /* output bytes */ #define WAVAIL (uInt)(q<s->read?s->read-q-1:s->end-q) #define LOADOUT {q=s->write;m=(uInt)WAVAIL;} -#define WRAP {if(q==s->end&&s->read!=s->window){q=s->window;m=(uInt)WAVAIL;}} +#define ZWRAP {if(q==s->end&&s->read!=s->window){q=s->window;m=(uInt)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} |