summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gzguts.h7
-rw-r--r--gzlib.c18
-rw-r--r--zlib-ng.map1
-rw-r--r--zlib.map1
4 files changed, 1 insertions, 26 deletions
diff --git a/gzguts.h b/gzguts.h
index 83be118..ad3690e 100644
--- a/gzguts.h
+++ b/gzguts.h
@@ -140,11 +140,6 @@ void Z_INTERNAL gz_error(gz_state *, int, const char *);
/* GT_OFF(x), where x is an unsigned value, is true if x > maximum z_off64_t
value -- needed when comparing unsigned to z_off64_t, which is signed
(possible z_off64_t types off_t, off64_t, and long are all signed) */
-#ifdef INT_MAX
-# define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > INT_MAX)
-#else
-unsigned Z_INTERNAL gz_intmax(void);
-# define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > gz_intmax())
-#endif
+#define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > INT_MAX)
#endif /* GZGUTS_H_ */
diff --git a/gzlib.c b/gzlib.c
index 4905516..c192840 100644
--- a/gzlib.c
+++ b/gzlib.c
@@ -523,21 +523,3 @@ void Z_INTERNAL gz_error(gz_state *state, int err, const char *msg) {
}
(void)snprintf(state->msg, strlen(state->path) + strlen(msg) + 3, "%s%s%s", state->path, ": ", msg);
}
-
-#ifndef INT_MAX
-/* portably return maximum value for an int (when limits.h presumed not
- available) -- we need to do this to cover cases where 2's complement not
- used, since C standard permits 1's complement and sign-bit representations,
- otherwise we could just use ((unsigned)-1) >> 1 */
-unsigned Z_INTERNAL gz_intmax() {
- unsigned p, q;
-
- p = 1;
- do {
- q = p;
- p <<= 1;
- p++;
- } while (p > q);
- return q >> 1;
-}
-#endif
diff --git a/zlib-ng.map b/zlib-ng.map
index b004603..461c256 100644
--- a/zlib-ng.map
+++ b/zlib-ng.map
@@ -66,7 +66,6 @@ ZLIB_NG_2.0.0 {
zng_zcfree;
zng_z_errmsg;
zng_gz_error;
- zng_gz_intmax;
_*;
};
diff --git a/zlib.map b/zlib.map
index f608f2b..fccc0e1 100644
--- a/zlib.map
+++ b/zlib.map
@@ -15,7 +15,6 @@ ZLIB_1.2.0 {
zcfree;
z_errmsg;
gz_error;
- gz_intmax;
_*;
};