From: Mark Adler <madler@alumni.caltech.edu>
Date: Mon, 30 Jan 2012 01:44:04 +0000 (-0800)
Subject: Avoid the use of the Objective-C reserved name "id".
X-Git-Tag: v1.2.6.1~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5dac2aa00710d4fee921cf492dd4b7fd2e27c238;p=thirdparty%2Fzlib-ng.git

Avoid the use of the Objective-C reserved name "id".
---

diff --git a/inflate.c b/inflate.c
index cc89517bc..0885c1d26 100644
--- a/inflate.c
+++ b/inflate.c
@@ -1275,7 +1275,7 @@ const Bytef *dictionary;
 uInt dictLength;
 {
     struct inflate_state FAR *state;
-    unsigned long id;
+    unsigned long dictid;
     unsigned char *next;
     unsigned avail;
     int ret;
@@ -1286,11 +1286,11 @@ uInt dictLength;
     if (state->wrap != 0 && state->mode != DICT)
         return Z_STREAM_ERROR;
 
-    /* check for correct dictionary id */
+    /* check for correct dictionary identifier */
     if (state->mode == DICT) {
-        id = adler32(0L, Z_NULL, 0);
-        id = adler32(id, dictionary, dictLength);
-        if (id != state->check)
+        dictid = adler32(0L, Z_NULL, 0);
+        dictid = adler32(dictid, dictionary, dictLength);
+        if (dictid != state->check)
             return Z_DATA_ERROR;
     }