From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 22 May 1998 13:02:22 +0000 (+0000)
Subject: change WRAP to ZWRAP so it doesn't conflict with IRIX includes
X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/commitdiff_plain/9add51f18ec5f753ba77b2011eae980eba4a0be5

change WRAP to ZWRAP so it doesn't conflict with IRIX includes
---

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}