[patch] Update OF to _Z_OF and force system zlib.h in libsrc/zlib

virtuoso-server-6.1.3-zlib.patch (text/plain), 22.93 KB, created by Alessandro Vietta on 2011-09-18 22:03:10 UTC

diff -ru libsrc/zlib/adler32.c libsrc/zlib/adler32.c
--- libsrc/zlib/adler32.c	2007-03-14 13:54:14.000000000 +0100
+++ libsrc/zlib/adler32.c	2011-09-18 19:21:10.743068575 +0200
@@ -6,7 +6,7 @@
 /* @(#) $Id: adler32.c,v 1.2 2007/03/14 12:54:14 source Exp $ */
 
 #define ZLIB_INTERNAL
-#include "zlib.h"
+#include <zlib.h>
 
 #define BASE 65521UL    /* largest prime smaller than 65536 */
 #define NMAX 5552
diff -ru libsrc/zlib/compress.c libsrc/zlib/compress.c
--- libsrc/zlib/compress.c	2007-03-14 13:54:14.000000000 +0100
+++ libsrc/zlib/compress.c	2011-09-18 19:21:10.744068422 +0200
@@ -6,7 +6,7 @@
 /* @(#) $Id: compress.c,v 1.2 2007/03/14 12:54:14 source Exp $ */
 
 #define ZLIB_INTERNAL
-#include "zlib.h"
+#include <zlib.h>
 
 /* ===========================================================================
      Compresses the source buffer into the destination buffer. The level
diff -ru libsrc/zlib/contrib/iostream/zfstream.h libsrc/zlib/contrib/iostream/zfstream.h
--- libsrc/zlib/contrib/iostream/zfstream.h	2007-03-14 13:54:14.000000000 +0100
+++ libsrc/zlib/contrib/iostream/zfstream.h	2011-09-18 19:21:10.500105754 +0200
@@ -3,7 +3,7 @@
 #define zfstream_h
 
 #include <fstream.h>
-#include "zlib.h"
+#include <zlib.h>
 
 class gzfilebuf : public streambuf {
 
diff -ru libsrc/zlib/contrib/iostream2/zstream.h libsrc/zlib/contrib/iostream2/zstream.h
--- libsrc/zlib/contrib/iostream2/zstream.h	2006-04-11 19:56:16.000000000 +0200
+++ libsrc/zlib/contrib/iostream2/zstream.h	2011-09-18 19:21:10.538099940 +0200
@@ -27,7 +27,7 @@
 #include <strstream.h>
 #include <string.h>
 #include <stdio.h>
-#include "zlib.h"
+#include <zlib.h>
 
 #if defined(_WIN32)
 #   include <fcntl.h>
diff -ru libsrc/zlib/contrib/iostream3/zfstream.h libsrc/zlib/contrib/iostream3/zfstream.h
--- libsrc/zlib/contrib/iostream3/zfstream.h	2007-03-14 13:54:14.000000000 +0100
+++ libsrc/zlib/contrib/iostream3/zfstream.h	2011-09-18 19:21:10.539099787 +0200
@@ -12,7 +12,7 @@
 
 #include <istream>  // not iostream, since we don't need cin/cout
 #include <ostream>
-#include "zlib.h"
+#include <zlib.h>
 
 /*****************************************************************************/
 
diff -ru libsrc/zlib/contrib/minizip/ioapi.c libsrc/zlib/contrib/minizip/ioapi.c
--- libsrc/zlib/contrib/minizip/ioapi.c	2007-03-14 13:54:14.000000000 +0100
+++ libsrc/zlib/contrib/minizip/ioapi.c	2011-09-18 19:21:10.534100552 +0200
@@ -10,7 +10,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "zlib.h"
+#include <zlib.h>
 #include "ioapi.h"
 
 
@@ -29,38 +29,38 @@
 #define SEEK_SET    0
 #endif
 
-voidpf ZCALLBACK fopen_file_func OF((
+voidpf ZCALLBACK fopen_file_func _Z_OF((
    voidpf opaque,
    const char* filename,
    int mode));
 
-uLong ZCALLBACK fread_file_func OF((
+uLong ZCALLBACK fread_file_func _Z_OF((
    voidpf opaque,
    voidpf stream,
    void* buf,
    uLong size));
 
-uLong ZCALLBACK fwrite_file_func OF((
+uLong ZCALLBACK fwrite_file_func _Z_OF((
    voidpf opaque,
    voidpf stream,
    const void* buf,
    uLong size));
 
-long ZCALLBACK ftell_file_func OF((
+long ZCALLBACK ftell_file_func _Z_OF((
    voidpf opaque,
    voidpf stream));
 
-long ZCALLBACK fseek_file_func OF((
+long ZCALLBACK fseek_file_func _Z_OF((
    voidpf opaque,
    voidpf stream,
    uLong offset,
    int origin));
 
-int ZCALLBACK fclose_file_func OF((
+int ZCALLBACK fclose_file_func _Z_OF((
    voidpf opaque,
    voidpf stream));
 
-int ZCALLBACK ferror_file_func OF((
+int ZCALLBACK ferror_file_func _Z_OF((
    voidpf opaque,
    voidpf stream));
 
diff -ru libsrc/zlib/contrib/minizip/ioapi.h libsrc/zlib/contrib/minizip/ioapi.h
--- libsrc/zlib/contrib/minizip/ioapi.h	2007-03-14 13:54:14.000000000 +0100
+++ libsrc/zlib/contrib/minizip/ioapi.h	2011-09-18 19:21:10.535100399 +0200
@@ -35,13 +35,13 @@
 extern "C" {
 #endif
 
-typedef voidpf (ZCALLBACK *open_file_func) OF((voidpf opaque, const char* filename, int mode));
-typedef uLong  (ZCALLBACK *read_file_func) OF((voidpf opaque, voidpf stream, void* buf, uLong size));
-typedef uLong  (ZCALLBACK *write_file_func) OF((voidpf opaque, voidpf stream, const void* buf, uLong size));
-typedef long   (ZCALLBACK *tell_file_func) OF((voidpf opaque, voidpf stream));
-typedef long   (ZCALLBACK *seek_file_func) OF((voidpf opaque, voidpf stream, uLong offset, int origin));
-typedef int    (ZCALLBACK *close_file_func) OF((voidpf opaque, voidpf stream));
-typedef int    (ZCALLBACK *testerror_file_func) OF((voidpf opaque, voidpf stream));
+typedef voidpf (ZCALLBACK *open_file_func) _Z_OF((voidpf opaque, const char* filename, int mode));
+typedef uLong  (ZCALLBACK *read_file_func) _Z_OF((voidpf opaque, voidpf stream, void* buf, uLong size));
+typedef uLong  (ZCALLBACK *write_file_func) _Z_OF((voidpf opaque, voidpf stream, const void* buf, uLong size));
+typedef long   (ZCALLBACK *tell_file_func) _Z_OF((voidpf opaque, voidpf stream));
+typedef long   (ZCALLBACK *seek_file_func) _Z_OF((voidpf opaque, voidpf stream, uLong offset, int origin));
+typedef int    (ZCALLBACK *close_file_func) _Z_OF((voidpf opaque, voidpf stream));
+typedef int    (ZCALLBACK *testerror_file_func) _Z_OF((voidpf opaque, voidpf stream));
 
 typedef struct zlib_filefunc_def_s
 {
@@ -57,7 +57,7 @@
 
 
 
-void fill_fopen_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def));
+void fill_fopen_filefunc _Z_OF((zlib_filefunc_def* pzlib_filefunc_def));
 
 #define ZREAD(filefunc,filestream,buf,size) ((*((filefunc).zread_file))((filefunc).opaque,filestream,buf,size))
 #define ZWRITE(filefunc,filestream,buf,size) ((*((filefunc).zwrite_file))((filefunc).opaque,filestream,buf,size))
diff -ru libsrc/zlib/contrib/minizip/iowin32.c libsrc/zlib/contrib/minizip/iowin32.c
--- libsrc/zlib/contrib/minizip/iowin32.c	2007-03-14 13:54:14.000000000 +0100
+++ libsrc/zlib/contrib/minizip/iowin32.c	2011-09-18 19:21:10.535100399 +0200
@@ -9,7 +9,7 @@
 
 #include <stdlib.h>
 
-#include "zlib.h"
+#include <zlib.h>
 #include "ioapi.h"
 #include "iowin32.h"
 
@@ -21,38 +21,38 @@
 #define INVALID_SET_FILE_POINTER ((DWORD)-1)
 #endif
 
-voidpf ZCALLBACK win32_open_file_func OF((
+voidpf ZCALLBACK win32_open_file_func _Z_OF((
    voidpf opaque,
    const char* filename,
    int mode));
 
-uLong ZCALLBACK win32_read_file_func OF((
+uLong ZCALLBACK win32_read_file_func _Z_OF((
    voidpf opaque,
    voidpf stream,
    void* buf,
    uLong size));
 
-uLong ZCALLBACK win32_write_file_func OF((
+uLong ZCALLBACK win32_write_file_func _Z_OF((
    voidpf opaque,
    voidpf stream,
    const void* buf,
    uLong size));
 
-long ZCALLBACK win32_tell_file_func OF((
+long ZCALLBACK win32_tell_file_func _Z_OF((
    voidpf opaque,
    voidpf stream));
 
-long ZCALLBACK win32_seek_file_func OF((
+long ZCALLBACK win32_seek_file_func _Z_OF((
    voidpf opaque,
    voidpf stream,
    uLong offset,
    int origin));
 
-int ZCALLBACK win32_close_file_func OF((
+int ZCALLBACK win32_close_file_func _Z_OF((
    voidpf opaque,
    voidpf stream));
 
-int ZCALLBACK win32_error_file_func OF((
+int ZCALLBACK win32_error_file_func _Z_OF((
    voidpf opaque,
    voidpf stream));
 
diff -ru libsrc/zlib/contrib/minizip/iowin32.h libsrc/zlib/contrib/minizip/iowin32.h
--- libsrc/zlib/contrib/minizip/iowin32.h	2007-03-14 13:54:14.000000000 +0100
+++ libsrc/zlib/contrib/minizip/iowin32.h	2011-09-18 19:21:10.535100399 +0200
@@ -14,7 +14,7 @@
 extern "C" {
 #endif
 
-void fill_win32_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def));
+void fill_win32_filefunc _Z_OF((zlib_filefunc_def* pzlib_filefunc_def));
 
 #ifdef __cplusplus
 }
diff -ru libsrc/zlib/contrib/minizip/mztools.c libsrc/zlib/contrib/minizip/mztools.c
--- libsrc/zlib/contrib/minizip/mztools.c	2007-03-14 13:54:14.000000000 +0100
+++ libsrc/zlib/contrib/minizip/mztools.c	2011-09-18 19:21:10.526101776 +0200
@@ -8,7 +8,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "zlib.h"
+#include <zlib.h>
 #include "unzip.h"
 
 #define READ_8(adr)  ((unsigned char)*(adr))
diff -ru libsrc/zlib/contrib/minizip/mztools.h libsrc/zlib/contrib/minizip/mztools.h
--- libsrc/zlib/contrib/minizip/mztools.h	2007-03-14 13:54:14.000000000 +0100
+++ libsrc/zlib/contrib/minizip/mztools.h	2011-09-18 19:21:10.527101623 +0200
@@ -12,7 +12,7 @@
 #endif
 
 #ifndef _ZLIB_H
-#include "zlib.h"
+#include <zlib.h>
 #endif
 
 #include "unzip.h"
diff -ru libsrc/zlib/contrib/minizip/unzip.c libsrc/zlib/contrib/minizip/unzip.c
--- libsrc/zlib/contrib/minizip/unzip.c	2007-03-14 13:54:14.000000000 +0100
+++ libsrc/zlib/contrib/minizip/unzip.c	2011-09-18 19:21:10.534100552 +0200
@@ -38,7 +38,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "zlib.h"
+#include <zlib.h>
 #include "unzip.h"
 
 #ifdef STDC
@@ -163,7 +163,7 @@
 */
 
 
-local int unzlocal_getByte OF((
+local int unzlocal_getByte _Z_OF((
     const zlib_filefunc_def* pzlib_filefunc_def,
     voidpf filestream,
     int *pi));
@@ -193,7 +193,7 @@
 /* ===========================================================================
    Reads a long in LSB order from the given gz_stream. Sets
 */
-local int unzlocal_getShort OF((
+local int unzlocal_getShort _Z_OF((
     const zlib_filefunc_def* pzlib_filefunc_def,
     voidpf filestream,
     uLong *pX));
@@ -221,7 +221,7 @@
     return err;
 }
 
-local int unzlocal_getLong OF((
+local int unzlocal_getLong _Z_OF((
     const zlib_filefunc_def* pzlib_filefunc_def,
     voidpf filestream,
     uLong *pX));
@@ -324,7 +324,7 @@
   Locate the Central directory of a zipfile (at the end, just before
     the global comment)
 */
-local uLong unzlocal_SearchCentralDir OF((
+local uLong unzlocal_SearchCentralDir _Z_OF((
     const zlib_filefunc_def* pzlib_filefunc_def,
     voidpf filestream));
 
@@ -563,7 +563,7 @@
 /*
   Get Info about the current file in the zipfile, with internal only info
 */
-local int unzlocal_GetCurrentFileInfoInternal OF((unzFile file,
+local int unzlocal_GetCurrentFileInfoInternal _Z_OF((unzFile file,
                                                   unz_file_info *pfile_info,
                                                   unz_file_info_internal
                                                   *pfile_info_internal,
diff -ru libsrc/zlib/contrib/minizip/unzip.h libsrc/zlib/contrib/minizip/unzip.h
--- libsrc/zlib/contrib/minizip/unzip.h	2007-03-14 13:54:14.000000000 +0100
+++ libsrc/zlib/contrib/minizip/unzip.h	2011-09-18 19:21:10.534100552 +0200
@@ -50,7 +50,7 @@
 #endif
 
 #ifndef _ZLIB_H
-#include "zlib.h"
+#include <zlib.h>
 #endif
 
 #ifndef _ZLIBIOAPI_H
@@ -119,7 +119,7 @@
     tm_unz tmu_date;
 } unz_file_info;
 
-extern int ZEXPORT unzStringFileNameCompare OF ((const char* fileName1,
+extern int ZEXPORT unzStringFileNameCompare _Z_OF((const char* fileName1,
                                                  const char* fileName2,
                                                  int iCaseSensitivity));
 /*
@@ -132,7 +132,7 @@
 */
 
 
-extern unzFile ZEXPORT unzOpen OF((const char *path));
+extern unzFile ZEXPORT unzOpen _Z_OF((const char *path));
 /*
   Open a Zip file. path contain the full pathname (by example,
      on a Windows XP computer "c:\\zlib\\zlib113.zip" or on an Unix computer
@@ -143,21 +143,21 @@
        of this unzip package.
 */
 
-extern unzFile ZEXPORT unzOpen2 OF((const char *path,
+extern unzFile ZEXPORT unzOpen2 _Z_OF((const char *path,
                                     zlib_filefunc_def* pzlib_filefunc_def));
 /*
    Open a Zip file, like unzOpen, but provide a set of file low level API
       for read/write the zip file (see ioapi.h)
 */
 
-extern int ZEXPORT unzClose OF((unzFile file));
+extern int ZEXPORT unzClose _Z_OF((unzFile file));
 /*
   Close a ZipFile opened with unzipOpen.
   If there is files inside the .Zip opened with unzOpenCurrentFile (see later),
     these files MUST be closed with unzipCloseCurrentFile before call unzipClose.
   return UNZ_OK if there is no problem. */
 
-extern int ZEXPORT unzGetGlobalInfo OF((unzFile file,
+extern int ZEXPORT unzGetGlobalInfo _Z_OF((unzFile file,
                                         unz_global_info *pglobal_info));
 /*
   Write info about the ZipFile in the *pglobal_info structure.
@@ -165,7 +165,7 @@
   return UNZ_OK if there is no problem. */
 
 
-extern int ZEXPORT unzGetGlobalComment OF((unzFile file,
+extern int ZEXPORT unzGetGlobalComment _Z_OF((unzFile file,
                                            char *szComment,
                                            uLong uSizeBuf));
 /*
@@ -178,20 +178,20 @@
 /***************************************************************************/
 /* Unzip package allow you browse the directory of the zipfile */
 
-extern int ZEXPORT unzGoToFirstFile OF((unzFile file));
+extern int ZEXPORT unzGoToFirstFile _Z_OF((unzFile file));
 /*
   Set the current file of the zipfile to the first file.
   return UNZ_OK if there is no problem
 */
 
-extern int ZEXPORT unzGoToNextFile OF((unzFile file));
+extern int ZEXPORT unzGoToNextFile _Z_OF((unzFile file));
 /*
   Set the current file of the zipfile to the next file.
   return UNZ_OK if there is no problem
   return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.
 */
 
-extern int ZEXPORT unzLocateFile OF((unzFile file,
+extern int ZEXPORT unzLocateFile _Z_OF((unzFile file,
                      const char *szFileName,
                      int iCaseSensitivity));
 /*
@@ -223,7 +223,7 @@
 
 /* ****************************************** */
 
-extern int ZEXPORT unzGetCurrentFileInfo OF((unzFile file,
+extern int ZEXPORT unzGetCurrentFileInfo _Z_OF((unzFile file,
                          unz_file_info *pfile_info,
                          char *szFileName,
                          uLong fileNameBufferSize,
@@ -249,13 +249,13 @@
    from it, and close it (you can close it before reading all the file)
    */
 
-extern int ZEXPORT unzOpenCurrentFile OF((unzFile file));
+extern int ZEXPORT unzOpenCurrentFile _Z_OF((unzFile file));
 /*
   Open for reading data the current file in the zipfile.
   If there is no error, the return value is UNZ_OK.
 */
 
-extern int ZEXPORT unzOpenCurrentFilePassword OF((unzFile file,
+extern int ZEXPORT unzOpenCurrentFilePassword _Z_OF((unzFile file,
                                                   const char* password));
 /*
   Open for reading data the current file in the zipfile.
@@ -263,7 +263,7 @@
   If there is no error, the return value is UNZ_OK.
 */
 
-extern int ZEXPORT unzOpenCurrentFile2 OF((unzFile file,
+extern int ZEXPORT unzOpenCurrentFile2 _Z_OF((unzFile file,
                                            int* method,
                                            int* level,
                                            int raw));
@@ -276,7 +276,7 @@
          but you CANNOT set method parameter as NULL
 */
 
-extern int ZEXPORT unzOpenCurrentFile3 OF((unzFile file,
+extern int ZEXPORT unzOpenCurrentFile3 _Z_OF((unzFile file,
                                            int* method,
                                            int* level,
                                            int raw,
@@ -291,13 +291,13 @@
 */
 
 
-extern int ZEXPORT unzCloseCurrentFile OF((unzFile file));
+extern int ZEXPORT unzCloseCurrentFile _Z_OF((unzFile file));
 /*
   Close the file in zip opened with unzOpenCurrentFile
   Return UNZ_CRCERROR if all the file was read but the CRC is not good
 */
 
-extern int ZEXPORT unzReadCurrentFile OF((unzFile file,
+extern int ZEXPORT unzReadCurrentFile _Z_OF((unzFile file,
                       voidp buf,
                       unsigned len));
 /*
@@ -311,17 +311,17 @@
     (UNZ_ERRNO for IO error, or zLib error for uncompress error)
 */
 
-extern z_off_t ZEXPORT unztell OF((unzFile file));
+extern z_off_t ZEXPORT unztell _Z_OF((unzFile file));
 /*
   Give the current position in uncompressed data
 */
 
-extern int ZEXPORT unzeof OF((unzFile file));
+extern int ZEXPORT unzeof _Z_OF((unzFile file));
 /*
   return 1 if the end of file was reached, 0 elsewhere
 */
 
-extern int ZEXPORT unzGetLocalExtrafield OF((unzFile file,
+extern int ZEXPORT unzGetLocalExtrafield _Z_OF((unzFile file,
                                              voidp buf,
                                              unsigned len));
 /*
diff -ru libsrc/zlib/contrib/minizip/zip.c libsrc/zlib/contrib/minizip/zip.c
--- libsrc/zlib/contrib/minizip/zip.c	2007-03-14 13:54:14.000000000 +0100
+++ libsrc/zlib/contrib/minizip/zip.c	2011-09-18 19:21:10.517103153 +0200
@@ -14,7 +14,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include "zlib.h"
+#include <zlib.h>
 #include "zip.h"
 
 #ifdef STDC
@@ -261,7 +261,7 @@
    nbByte == 1, 2 or 4 (byte, short or long)
 */
 
-local int ziplocal_putValue OF((const zlib_filefunc_def* pzlib_filefunc_def,
+local int ziplocal_putValue _Z_OF((const zlib_filefunc_def* pzlib_filefunc_def,
                                 voidpf filestream, uLong x, int nbByte));
 local int ziplocal_putValue (pzlib_filefunc_def, filestream, x, nbByte)
     const zlib_filefunc_def* pzlib_filefunc_def;
@@ -290,7 +290,7 @@
         return ZIP_OK;
 }
 
-local void ziplocal_putValue_inmemory OF((void* dest, uLong x, int nbByte));
+local void ziplocal_putValue_inmemory _Z_OF((void* dest, uLong x, int nbByte));
 local void ziplocal_putValue_inmemory (dest, x, nbByte)
     void* dest;
     uLong x;
@@ -332,7 +332,7 @@
 
 /****************************************************************************/
 
-local int ziplocal_getByte OF((
+local int ziplocal_getByte _Z_OF((
     const zlib_filefunc_def* pzlib_filefunc_def,
     voidpf filestream,
     int *pi));
@@ -362,7 +362,7 @@
 /* ===========================================================================
    Reads a long in LSB order from the given gz_stream. Sets
 */
-local int ziplocal_getShort OF((
+local int ziplocal_getShort _Z_OF((
     const zlib_filefunc_def* pzlib_filefunc_def,
     voidpf filestream,
     uLong *pX));
@@ -390,7 +390,7 @@
     return err;
 }
 
-local int ziplocal_getLong OF((
+local int ziplocal_getLong _Z_OF((
     const zlib_filefunc_def* pzlib_filefunc_def,
     voidpf filestream,
     uLong *pX));
@@ -433,7 +433,7 @@
   Locate the Central directory of a zipfile (at the end, just before
     the global comment)
 */
-local uLong ziplocal_SearchCentralDir OF((
+local uLong ziplocal_SearchCentralDir _Z_OF((
     const zlib_filefunc_def* pzlib_filefunc_def,
     voidpf filestream));
 
diff -ru libsrc/zlib/contrib/minizip/zip.h libsrc/zlib/contrib/minizip/zip.h
--- libsrc/zlib/contrib/minizip/zip.h	2007-03-14 13:54:14.000000000 +0100
+++ libsrc/zlib/contrib/minizip/zip.h	2011-09-18 19:21:10.525101929 +0200
@@ -51,7 +51,7 @@
 #endif
 
 #ifndef _ZLIB_H
-#include "zlib.h"
+#include <zlib.h>
 #endif
 
 #ifndef _ZLIBIOAPI_H
@@ -111,7 +111,7 @@
 #define APPEND_STATUS_CREATEAFTER   (1)
 #define APPEND_STATUS_ADDINZIP      (2)
 
-extern zipFile ZEXPORT zipOpen OF((const char *pathname, int append));
+extern zipFile ZEXPORT zipOpen _Z_OF((const char *pathname, int append));
 /*
   Create a zipfile.
      pathname contain on Windows XP a filename like "c:\\zlib\\zlib113.zip" or on
@@ -131,12 +131,12 @@
    Of couse, you can use RAW reading and writing to copy the file you did not want delte
 */
 
-extern zipFile ZEXPORT zipOpen2 OF((const char *pathname,
+extern zipFile ZEXPORT zipOpen2 _Z_OF((const char *pathname,
                                    int append,
                                    zipcharpc* globalcomment,
                                    zlib_filefunc_def* pzlib_filefunc_def));
 
-extern int ZEXPORT zipOpenNewFileInZip OF((zipFile file,
+extern int ZEXPORT zipOpenNewFileInZip _Z_OF((zipFile file,
                        const char* filename,
                        const zip_fileinfo* zipfi,
                        const void* extrafield_local,
@@ -160,7 +160,7 @@
 */
 
 
-extern int ZEXPORT zipOpenNewFileInZip2 OF((zipFile file,
+extern int ZEXPORT zipOpenNewFileInZip2 _Z_OF((zipFile file,
                                             const char* filename,
                                             const zip_fileinfo* zipfi,
                                             const void* extrafield_local,
@@ -176,7 +176,7 @@
   Same than zipOpenNewFileInZip, except if raw=1, we write raw file
  */
 
-extern int ZEXPORT zipOpenNewFileInZip3 OF((zipFile file,
+extern int ZEXPORT zipOpenNewFileInZip3 _Z_OF((zipFile file,
                                             const char* filename,
                                             const zip_fileinfo* zipfi,
                                             const void* extrafield_local,
@@ -201,19 +201,19 @@
  */
 
 
-extern int ZEXPORT zipWriteInFileInZip OF((zipFile file,
+extern int ZEXPORT zipWriteInFileInZip _Z_OF((zipFile file,
                        const void* buf,
                        unsigned len));
 /*
   Write data in the zipfile
 */
 
-extern int ZEXPORT zipCloseFileInZip OF((zipFile file));
+extern int ZEXPORT zipCloseFileInZip _Z_OF((zipFile file));
 /*
   Close the current file in the zipfile
 */
 
-extern int ZEXPORT zipCloseFileInZipRaw OF((zipFile file,
+extern int ZEXPORT zipCloseFileInZipRaw _Z_OF((zipFile file,
                                             uLong uncompressed_size,
                                             uLong crc32));
 /*
@@ -222,7 +222,7 @@
   uncompressed_size and crc32 are value for the uncompressed size
 */
 
-extern int ZEXPORT zipClose OF((zipFile file,
+extern int ZEXPORT zipClose _Z_OF((zipFile file,
                 const char* global_comment));
 /*
   Close the zipfile
diff -ru libsrc/zlib/contrib/testzlib/testzlib.c libsrc/zlib/contrib/testzlib/testzlib.c
--- libsrc/zlib/contrib/testzlib/testzlib.c	2007-09-11 12:14:57.000000000 +0200
+++ libsrc/zlib/contrib/testzlib/testzlib.c	2011-09-18 19:21:10.516103306 +0200
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <windows.h>
 
-#include "zlib.h"
+#include <zlib.h>
 
 
 void MyDoMinus64(LARGE_INTEGER *R,LARGE_INTEGER A,LARGE_INTEGER B)
diff -ru libsrc/zlib/contrib/untgz/untgz.c libsrc/zlib/contrib/untgz/untgz.c
--- libsrc/zlib/contrib/untgz/untgz.c	2007-03-14 13:54:14.000000000 +0100
+++ libsrc/zlib/contrib/untgz/untgz.c	2011-09-18 19:21:10.501105601 +0200
@@ -12,7 +12,7 @@
 #include <time.h>
 #include <errno.h>
 
-#include "zlib.h"
+#include <zlib.h>
 
 #ifdef unix
 #  include <unistd.h>
diff -ru libsrc/zlib/minigzip.c libsrc/zlib/minigzip.c
--- libsrc/zlib/minigzip.c	2007-03-14 13:54:14.000000000 +0100
+++ libsrc/zlib/minigzip.c	2011-09-18 19:21:10.855051439 +0200
@@ -16,7 +16,7 @@
 /* @(#) $Id: minigzip.c,v 1.2 2007/03/14 12:54:14 source Exp $ */
 
 #include <stdio.h>
-#include "zlib.h"
+#include <zlib.h>
 
 #ifdef STDC
 #  include <string.h>
diff -ru libsrc/zlib/uncompr.c libsrc/zlib/uncompr.c
--- libsrc/zlib/uncompr.c	2007-03-14 13:54:14.000000000 +0100
+++ libsrc/zlib/uncompr.c	2011-09-18 19:21:10.744068422 +0200
@@ -6,7 +6,7 @@
 /* @(#) $Id: uncompr.c,v 1.2 2007/03/14 12:54:14 source Exp $ */
 
 #define ZLIB_INTERNAL
-#include "zlib.h"
+#include <zlib.h>
 
 /* ===========================================================================
      Decompresses the source buffer into the destination buffer.  sourceLen is
diff -ru libsrc/zlib/zutil.h libsrc/zlib/zutil.h
--- libsrc/zlib/zutil.h	2007-03-14 13:54:14.000000000 +0100
+++ libsrc/zlib/zutil.h	2011-09-18 19:21:10.744068422 +0200
@@ -14,7 +14,7 @@
 #define ZUTIL_H
 
 #define ZLIB_INTERNAL
-#include "zlib.h"
+#include <zlib.h>
 
 #ifdef STDC
 #  ifndef _WIN32_WCE