jdk/src/share/native/java/util/zip/zlib-1.2.3/patches/zconf.h.diff
changeset 11237 ff9cf1de21fa
parent 11236 0de47eef399c
parent 11235 3117d9a4bb02
child 11238 e2e56339976e
equal deleted inserted replaced
11236:0de47eef399c 11237:ff9cf1de21fa
     1 --- /home/sherman/TL/zlib-1.2.3_ORG/zconf.h	Fri May 27 23:40:35 2005
       
     2 +++ zconf.h	Tue Aug 25 14:22:28 2009
       
     3 @@ -8,6 +8,9 @@
       
     4  #ifndef ZCONF_H
       
     5  #define ZCONF_H
       
     6  
       
     7 +/* for _LP64 */
       
     8 +#include <sys/types.h>
       
     9 +
       
    10  /*
       
    11   * If you *really* need a unique prefix for all types and library functions,
       
    12   * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
       
    13 @@ -261,7 +264,11 @@
       
    14  typedef unsigned char  Byte;  /* 8 bits */
       
    15  #endif
       
    16  typedef unsigned int   uInt;  /* 16 bits or more */
       
    17 +#ifdef _LP64
       
    18 +typedef unsigned int  uLong;  /* 32 bits or more */
       
    19 +#else
       
    20  typedef unsigned long  uLong; /* 32 bits or more */
       
    21 +#endif
       
    22  
       
    23  #ifdef SMALL_MEDIUM
       
    24     /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */