< prev index next >

src/java.base/share/native/libzip/zlib/zconf.h

Print this page
@@ -21,11 +21,11 @@
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  
  /* zconf.h -- configuration of the zlib compression library
-  * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
+  * Copyright (C) 1995-2024 Jean-loup Gailly, Mark Adler
   * For conditions of distribution and use, see copyright notice in zlib.h
   */
  
  /* @(#) $Id$ */
  

@@ -263,11 +263,15 @@
  #else
  #  define z_const
  #endif
  
  #ifdef Z_SOLO
-    typedef unsigned long z_size_t;
+ #  ifdef _WIN64
+      typedef unsigned long long z_size_t;
+ #  else
+      typedef unsigned long z_size_t;
+ #  endif
  #else
  #  define z_longlong long long
  #  if defined(NO_SIZE_T)
       typedef unsigned NO_SIZE_T z_size_t;
  #  elif defined(STDC)

@@ -318,18 +322,10 @@
  #  else
  #    define OF(args)  ()
  #  endif
  #endif
  
- #ifndef Z_ARG /* function prototypes for stdarg */
- #  if defined(STDC) || defined(Z_HAVE_STDARG_H)
- #    define Z_ARG(args)  args
- #  else
- #    define Z_ARG(args)  ()
- #  endif
- #endif
- 
  /* The following definitions for FAR are needed only for MSDOS mixed
   * model programming (small or medium model with some far allocations).
   * This was tested only with MSC; for other MSDOS compilers you may have
   * to define NO_MEMCPY in zutil.h.  If you don't need the mixed model,
   * just define FAR to be empty.

@@ -542,11 +538,11 @@
  #endif
  
  #if !defined(_WIN32) && defined(Z_LARGE64)
  #  define z_off64_t off64_t
  #else
- #  if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO)
+ #  if defined(_WIN32) && !defined(__GNUC__)
  #    define z_off64_t __int64
  #  else
  #    define z_off64_t z_off_t
  #  endif
  #endif
< prev index next >