Index: third_party/zlib/zutil.h |
diff --git a/third_party/zlib/zutil.h b/third_party/zlib/zutil.h |
index fe9e53cc9772814f3df4b9215c7a2407beb19950..4425bcf75eb38c9f63fce15973cd585d509cd459 100644 |
--- a/third_party/zlib/zutil.h |
+++ b/third_party/zlib/zutil.h |
@@ -1,5 +1,5 @@ |
/* zutil.h -- internal interface and configuration of the compression library |
- * Copyright (C) 1995-2013 Jean-loup Gailly. |
+ * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler |
* For conditions of distribution and use, see copyright notice in zlib.h |
*/ |
@@ -51,7 +51,9 @@ |
#ifndef local |
# define local static |
#endif |
-/* compile with -Dlocal if your debugger can't find static symbols */ |
+/* since "static" is used to mean two completely different things in C, we |
+ define "local" for the non-static meaning of "static", for readability |
+ (compile with -Dlocal if your debugger can't find static symbols) */ |
typedef unsigned char uch; |
typedef uch FAR uchf; |
@@ -113,28 +115,38 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ |
#endif |
#ifdef AMIGA |
-# define OS_CODE 0x01 |
+# define OS_CODE 1 |
#endif |
#if defined(VAXC) || defined(VMS) |
-# define OS_CODE 0x02 |
+# define OS_CODE 2 |
# define F_OPEN(name, mode) \ |
fopen((name), (mode), "mbc=60", "ctx=stm", "rfm=fix", "mrs=512") |
#endif |
+#ifdef __370__ |
+# if __TARGET_LIB__ < 0x20000000 |
+# define OS_CODE 4 |
+# elif __TARGET_LIB__ < 0x40000000 |
+# define OS_CODE 11 |
+# else |
+# define OS_CODE 8 |
+# endif |
+#endif |
+ |
#if defined(ATARI) || defined(atarist) |
-# define OS_CODE 0x05 |
+# define OS_CODE 5 |
#endif |
#ifdef OS2 |
-# define OS_CODE 0x06 |
+# define OS_CODE 6 |
# if defined(M_I86) && !defined(Z_SOLO) |
# include <malloc.h> |
# endif |
#endif |
#if defined(MACOS) || defined(TARGET_OS_MAC) |
-# define OS_CODE 0x07 |
+# define OS_CODE 7 |
# ifndef Z_SOLO |
# if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os |
# include <unix.h> /* for fdopen */ |
@@ -146,24 +158,24 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ |
# endif |
#endif |
-#ifdef TOPS20 |
-# define OS_CODE 0x0a |
+#ifdef __acorn |
+# define OS_CODE 13 |
#endif |
-#ifdef _MSC_VER |
-#define zalign(x) __declspec(align(x)) |
-#else |
-#define zalign(x) __attribute__((aligned((x)))) |
+#if defined(WIN32) && !defined(__CYGWIN__) |
+# define OS_CODE 10 |
#endif |
-#ifdef WIN32 |
-# ifndef __CYGWIN__ /* Cygwin is Unix, not Win32 */ |
-# define OS_CODE 0x0b |
-# endif |
+#ifdef _BEOS_ |
+# define OS_CODE 16 |
#endif |
-#ifdef __50SERIES /* Prime/PRIMOS */ |
-# define OS_CODE 0x0f |
+#ifdef __TOS_OS400__ |
+# define OS_CODE 18 |
+#endif |
+ |
+#ifdef __APPLE__ |
+# define OS_CODE 19 |
#endif |
#if defined(_BEOS_) || defined(RISCOS) |
@@ -198,7 +210,7 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ |
/* common defaults */ |
#ifndef OS_CODE |
-# define OS_CODE 0x03 /* assume Unix */ |
+# define OS_CODE 3 /* assume Unix */ |
#endif |
#ifndef F_OPEN |
@@ -237,7 +249,7 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ |
#endif |
/* Diagnostic functions */ |
-#ifdef DEBUG |
+#ifdef ZLIB_DEBUG |
# include <stdio.h> |
extern int ZLIB_INTERNAL z_verbose; |
extern void ZLIB_INTERNAL z_error OF((char *m)); |
@@ -271,4 +283,10 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ |
#define ZSWAP32(q) ((((q) >> 24) & 0xff) + (((q) >> 8) & 0xff00) + \ |
(((q) & 0xff00) << 8) + (((q) & 0xff) << 24)) |
+#ifdef _MSC_VER |
+#define zalign(x) __declspec(align(x)) |
+#else |
+#define zalign(x) __attribute__((aligned((x)))) |
+#endif |
+ |
#endif /* ZUTIL_H */ |