WebSVN – Kolibri OS – Diff – /programs/develop/libraries/zlib/zutil.h

 /* zutil.h -- internal interface and configuration of the compression library
- * Copyright (C) 1995-2010 Jean-loup Gailly.
+ * Copyright (C) 1995-2013 Jean-loup Gailly.
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 /* WARNING: this file should *not* be used by applications. It is
 /* @(#) $Id$ */
 #ifndef ZUTIL_H
 #define ZUTIL_H
-#if ((__GNUC__-0) * 10 + __GNUC_MINOR__-0 >= 33) && !defined(NO_VIZ)
+#ifdef HAVE_HIDDEN
 #  define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
 #else
 #  define ZLIB_INTERNAL
 #endif
 #include "zlib.h"
-#ifdef STDC
+#if defined(STDC) && !defined(Z_SOLO)
 #  if !(defined(_WIN32_WCE) && defined(_MSC_VER))
 #    include
+#  endif
+#  include
+#  include
+#endif
 #  endif
-#  include
+#ifdef Z_SOLO
-#  include
+   typedef long ptrdiff_t;  /* guess -- will be caught if guess is wrong */
 #endif
 typedef uch FAR uchf;
 typedef unsigned short ush;
 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) \
-  return (strm->msg = (char*)ERR_MSG(err), (err))
+  return (strm->msg = ERR_MSG(err), (err))
         /* target dependencies */
+#if defined(MSDOS) || (defined(WINDOWS) && !defined(WIN32))
-#if defined(MSDOS) || (defined(WINDOWS) && !defined(WIN32))
+#  define OS_CODE  0x00
-#  define OS_CODE  0x00
+#  ifndef Z_SOLO
-#  if defined(__TURBOC__) || defined(__BORLANDC__)
+#    if defined(__TURBOC__) || defined(__BORLANDC__)
-#    if (__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__))
+#      if (__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__))
-       /* Allow compilation with ANSI keywords only enabled */
+         /* Allow compilation with ANSI keywords only enabled */
-#    endif
+#      endif
-#  else /* MSC or DJGPP */
+#    else /* MSC or DJGPP */
-#    include
+#      include
-#  endif
+#    endif
-#endif
+#  endif
+#endif
 #ifdef AMIGA
 #  define OS_CODE  0x01
 #  define OS_CODE  0x05
 #endif
 #ifdef OS2
 #  define OS_CODE  0x06
-#  ifdef M_I86
+#  if defined(M_I86) && !defined(Z_SOLO)
 #    include
 #  endif
 #endif
+#if defined(MACOS) || defined(TARGET_OS_MAC)
-#if defined(MACOS) || defined(TARGET_OS_MAC)
+#  define OS_CODE  0x07
-#  define OS_CODE  0x07
+#  ifndef Z_SOLO
-#  if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
+#    if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
-#    include  /* for fdopen */
+#      include  /* for fdopen */
-#  else
+#    else
-#    ifndef fdopen
+#      ifndef fdopen
-#      define fdopen(fd,mode) NULL /* No fdopen() */
+#        define fdopen(fd,mode) NULL /* No fdopen() */
-#    endif
+#      endif
+#    endif
 #  endif
 #endif
 #  else
 #    define fdopen(fd,type)  _fdopen(fd,type)
 #  endif
 #endif
-#if defined(__BORLANDC__)
+#if defined(__BORLANDC__) && !defined(MSDOS)
   #pragma warn -8004
   #pragma warn -8008
   #pragma warn -8066
 #endif
+/* provide prototypes for these when building zlib without LFS */
-/* provide prototypes for these when building zlib without LFS */
+#if !defined(_WIN32) && \
-#if !defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0
+    (!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));
 #  define F_OPEN(name, mode) fopen((name), (mode))
 #endif
-         /* functions */
-#if defined(STDC99) || (defined(__TURBOC__) && __TURBOC__ >= 0x550)
-#  ifndef HAVE_VSNPRINTF
-#    define HAVE_VSNPRINTF
-#  endif
-#endif
-#if defined(__CYGWIN__)
-#  ifndef HAVE_VSNPRINTF
-#    define HAVE_VSNPRINTF
-#  endif
-#endif
-#ifndef HAVE_VSNPRINTF
-#  ifdef MSDOS
-     /* vsnprintf may exist on some MS-DOS compilers (DJGPP?),
-        but for now we just assume it doesn't. */
-#    define NO_vsnprintf
-#  endif
-#  ifdef __TURBOC__
-#    define NO_vsnprintf
-#  endif
-#  ifdef WIN32
+         /* functions */
-     /* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */
-#    if !defined(vsnprintf) && !defined(NO_vsnprintf)
-#      if !defined(_MSC_VER) || ( defined(_MSC_VER) && _MSC_VER < 1500 )
-#         define vsnprintf _vsnprintf
-#      endif
-#    endif
-#  endif
-#  ifdef __SASC
-#    define NO_vsnprintf
-#  endif
-#endif
-#ifdef VMS
-#  define NO_vsnprintf
-#endif
-#if defined(pyr)
+#if defined(pyr) || defined(Z_SOLO)
 #  define NO_MEMCPY
 #endif
 #if defined(SMALL_MEDIUM) && !defined(_MSC_VER) && !defined(__SC__)
 #  define Tracevv(x)
 #  define Tracec(c,x)
 #  define Tracecv(c,x)
 #endif
 #ifndef Z_SOLO
-voidpf ZLIB_INTERNAL zcalloc OF((voidpf opaque, unsigned items,
+   voidpf ZLIB_INTERNAL zcalloc OF((voidpf opaque, unsigned items,
-                        unsigned size));
+                                    unsigned size));
+   void ZLIB_INTERNAL zcfree  OF((voidpf opaque, voidpf ptr));
-void ZLIB_INTERNAL zcfree  OF((voidpf opaque, voidpf ptr));
+#endif
 #define ZALLOC(strm, items, size) \
            (*((strm)->zalloc))((strm)->opaque, (items), (size))
+#define ZFREE(strm, addr)  (*((strm)->zfree))((strm)->opaque, (voidpf)(addr))
+#define TRY_FREE(s, p) {if (p) ZFREE(s, p);}
+/* Reverse the bytes in a 32-bit value */
-#define ZFREE(strm, addr)  (*((strm)->zfree))((strm)->opaque, (voidpf)(addr))
+#define ZSWAP32(q) ((((q) >> 24) & 0xff) + (((q) >> 8) & 0xff00) + \

Subversion Repositories Kolibri OS

(root)/programs/develop/libraries/zlib/zutil.h – Rev 1896 → 3926