projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gdb: Convert language la_collect_symbol_completion_matches field to a method
[deliverable/binutils-gdb.git]
/
zlib
/
zutil.h
diff --git
a/zlib/zutil.h
b/zlib/zutil.h
index ed6b127e1e400cc4e99a49e1394f0696451fc8b9..4b596adf6295e2cea5266de15353f66d90d6f2b4 100644
(file)
--- a/
zlib/zutil.h
+++ b/
zlib/zutil.h
@@
-1,5
+1,5
@@
/* zutil.h -- internal interface and configuration of the compression library
/* zutil.h -- internal interface and configuration of the compression library
- * Copyright (C) 1995-201
2 Jean-loup Gailly.
+ * Copyright (C) 1995-201
6 Jean-loup Gailly, Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*/
* For conditions of distribution and use, see copyright notice in zlib.h
*/
@@
-36,7
+36,9
@@
#ifndef local
# define local static
#endif
#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;
typedef unsigned char uch;
typedef uch FAR uchf;
@@
-44,13
+46,13
@@
typedef unsigned short ush;
typedef ush FAR ushf;
typedef unsigned long ulg;
typedef ush FAR ushf;
typedef unsigned long ulg;
-extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
+extern
z_
const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
/* (size given to avoid silly warnings with Visual C++) */
#define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)]
#define ERR_RETURN(strm,err) \
/* (size given to avoid silly warnings with Visual C++) */
#define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)]
#define ERR_RETURN(strm,err) \
- return (strm->msg =
(char*)
ERR_MSG(err), (err))
+ return (strm->msg = ERR_MSG(err), (err))
/* To be used only when the state is known to be valid */
/* common constants */
/* To be used only when the state is known to be valid */
/* common constants */
@@
-98,28
+100,38
@@
extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
#endif
#ifdef AMIGA
#endif
#ifdef AMIGA
-# define OS_CODE
0x0
1
+# define OS_CODE 1
#endif
#if defined(VAXC) || defined(VMS)
#endif
#if defined(VAXC) || defined(VMS)
-# define OS_CODE
0x0
2
+# define OS_CODE 2
# define F_OPEN(name, mode) \
fopen((name), (mode), "mbc=60", "ctx=stm", "rfm=fix", "mrs=512")
#endif
# 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)
#if defined(ATARI) || defined(atarist)
-# define OS_CODE
0x0
5
+# define OS_CODE 5
#endif
#ifdef OS2
#endif
#ifdef OS2
-# define OS_CODE
0x0
6
+# define OS_CODE 6
# if defined(M_I86) && !defined(Z_SOLO)
# include <malloc.h>
# endif
#endif
#if defined(MACOS) || defined(TARGET_OS_MAC)
# if defined(M_I86) && !defined(Z_SOLO)
# include <malloc.h>
# endif
#endif
#if defined(MACOS) || defined(TARGET_OS_MAC)
-# define OS_CODE
0x0
7
+# define OS_CODE 7
# ifndef Z_SOLO
# if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
# include <unix.h> /* for fdopen */
# ifndef Z_SOLO
# if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
# include <unix.h> /* for fdopen */
@@
-131,18
+143,24
@@
extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
# endif
#endif
# endif
#endif
-#ifdef
TOPS20
-# define OS_CODE
0x0a
+#ifdef
__acorn
+# define OS_CODE
13
#endif
#endif
-#ifdef WIN32
-# ifndef __CYGWIN__ /* Cygwin is Unix, not Win32 */
-# define OS_CODE 0x0b
-# 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
#endif
#endif
-#ifdef __
50SERIES /* Prime/PRIMOS */
-# define OS_CODE
0x0f
+#ifdef __
APPLE__
+# define OS_CODE
19
#endif
#if defined(_BEOS_) || defined(RISCOS)
#endif
#if defined(_BEOS_) || defined(RISCOS)
@@
-168,7
+186,8
@@
extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
#endif
/* provide prototypes for these when building zlib without LFS */
#endif
/* provide prototypes for these when building zlib without LFS */
-#if !defined(_WIN32) && (!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0)
+#if !defined(_WIN32) && \
+ (!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0)
ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
#endif
ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
#endif
@@
-176,7
+195,7
@@
extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
/* common defaults */
#ifndef OS_CODE
/* common defaults */
#ifndef OS_CODE
-# define OS_CODE
0x03
/* assume Unix */
+# define OS_CODE
3
/* assume Unix */
#endif
#ifndef F_OPEN
#endif
#ifndef F_OPEN
@@
-215,7
+234,7
@@
extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
#endif
/* Diagnostic functions */
#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));
# include <stdio.h>
extern int ZLIB_INTERNAL z_verbose;
extern void ZLIB_INTERNAL z_error OF((char *m));
This page took
0.024622 seconds
and
4
git commands to generate.