diff options
Diffstat (limited to 'src/zutil.h')
| -rw-r--r-- | src/zutil.h | 52 |
1 files changed, 17 insertions, 35 deletions
diff --git a/src/zutil.h b/src/zutil.h index b079ea6..24ab06b 100644 --- a/src/zutil.h +++ b/src/zutil.h @@ -1,5 +1,5 @@ /* zutil.h -- internal interface and configuration of the compression library - * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler + * Copyright (C) 1995-2013 Jean-loup Gailly. * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -36,9 +36,7 @@ #ifndef local # define local static #endif -/* 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) */ +/* compile with -Dlocal if your debugger can't find static symbols */ typedef unsigned char uch; typedef uch FAR uchf; @@ -100,38 +98,28 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ #endif #ifdef AMIGA -# define OS_CODE 1 +# define OS_CODE 0x01 #endif #if defined(VAXC) || defined(VMS) -# define OS_CODE 2 +# define OS_CODE 0x02 # 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 5 +# define OS_CODE 0x05 #endif #ifdef OS2 -# define OS_CODE 6 +# define OS_CODE 0x06 # if defined(M_I86) && !defined(Z_SOLO) # include <malloc.h> # endif #endif #if defined(MACOS) || defined(TARGET_OS_MAC) -# define OS_CODE 7 +# define OS_CODE 0x07 # ifndef Z_SOLO # if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os # include <unix.h> /* for fdopen */ @@ -143,24 +131,18 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ # endif #endif -#ifdef __acorn -# define OS_CODE 13 +#ifdef TOPS20 +# define OS_CODE 0x0a #endif -#if defined(WIN32) && !defined(__CYGWIN__) -# define OS_CODE 10 -#endif - -#ifdef _BEOS_ -# define OS_CODE 16 -#endif - -#ifdef __TOS_OS400__ -# define OS_CODE 18 +#ifdef WIN32 +# ifndef __CYGWIN__ /* Cygwin is Unix, not Win32 */ +# define OS_CODE 0x0b +# endif #endif -#ifdef __APPLE__ -# define OS_CODE 19 +#ifdef __50SERIES /* Prime/PRIMOS */ +# define OS_CODE 0x0f #endif #if defined(_BEOS_) || defined(RISCOS) @@ -195,7 +177,7 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ /* common defaults */ #ifndef OS_CODE -# define OS_CODE 3 /* assume Unix */ +# define OS_CODE 0x03 /* assume Unix */ #endif #ifndef F_OPEN @@ -234,7 +216,7 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ #endif /* Diagnostic functions */ -#ifdef ZLIB_DEBUG +#ifdef DEBUG # include <stdio.h> extern int ZLIB_INTERNAL z_verbose; extern void ZLIB_INTERNAL z_error OF((char *m)); |