--- /var/tmp/portage/dev-db/mariadb-10.0.29/work/mysql/storage/connect/ioapi.h 2017-01-11 20:45:20.000000000 -0500
|
+++ /usr/include/minizip/ioapi.h 2017-01-16 22:23:48.000000000 -0500
|
@@ -132,14 +132,14 @@
|
|
|
|
-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 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 int (ZCALLBACK *close_file_func) _Z_OF((voidpf opaque, voidpf stream));
|
+typedef int (ZCALLBACK *testerror_file_func) _Z_OF((voidpf opaque, voidpf stream));
|
|
-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 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));
|
|
|
/* here is the "old" 32 bits structure structure */
|
@@ -155,9 +155,9 @@
|
voidpf opaque;
|
} zlib_filefunc_def;
|
|
-typedef ZPOS64_T (ZCALLBACK *tell64_file_func) OF((voidpf opaque, voidpf stream));
|
-typedef long (ZCALLBACK *seek64_file_func) OF((voidpf opaque, voidpf stream, ZPOS64_T offset, int origin));
|
-typedef voidpf (ZCALLBACK *open64_file_func) OF((voidpf opaque, const void* filename, int mode));
|
+typedef ZPOS64_T (ZCALLBACK *tell64_file_func) _Z_OF((voidpf opaque, voidpf stream));
|
+typedef long (ZCALLBACK *seek64_file_func) _Z_OF((voidpf opaque, voidpf stream, ZPOS64_T offset, int origin));
|
+typedef voidpf (ZCALLBACK *open64_file_func) _Z_OF((voidpf opaque, const void* filename, int mode));
|
|
typedef struct zlib_filefunc64_def_s
|
{
|
@@ -171,8 +171,8 @@
|
voidpf opaque;
|
} zlib_filefunc64_def;
|
|
-void fill_fopen64_filefunc OF((zlib_filefunc64_def* pzlib_filefunc_def));
|
-void fill_fopen_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def));
|
+void fill_fopen64_filefunc _Z_OF((zlib_filefunc64_def* pzlib_filefunc_def));
|
+void fill_fopen_filefunc _Z_OF((zlib_filefunc_def* pzlib_filefunc_def));
|
|
/* now internal definition, only for zip.c and unzip.h */
|
typedef struct zlib_filefunc64_32_def_s
|
@@ -191,9 +191,9 @@
|
#define ZCLOSE64(filefunc,filestream) ((*((filefunc).zfile_func64.zclose_file)) ((filefunc).zfile_func64.opaque,filestream))
|
#define ZERROR64(filefunc,filestream) ((*((filefunc).zfile_func64.zerror_file)) ((filefunc).zfile_func64.opaque,filestream))
|
|
-voidpf call_zopen64 OF((const zlib_filefunc64_32_def* pfilefunc,const void*filename,int mode));
|
-long call_zseek64 OF((const zlib_filefunc64_32_def* pfilefunc,voidpf filestream, ZPOS64_T offset, int origin));
|
-ZPOS64_T call_ztell64 OF((const zlib_filefunc64_32_def* pfilefunc,voidpf filestream));
|
+voidpf call_zopen64 _Z_OF((const zlib_filefunc64_32_def* pfilefunc,const void*filename,int mode));
|
+long call_zseek64 _Z_OF((const zlib_filefunc64_32_def* pfilefunc,voidpf filestream, ZPOS64_T offset, int origin));
|
+ZPOS64_T call_ztell64 _Z_OF((const zlib_filefunc64_32_def* pfilefunc,voidpf filestream));
|
|
void fill_zlib_filefunc64_32_def_from_filefunc32(zlib_filefunc64_32_def* p_filefunc64_32,const zlib_filefunc_def* p_filefunc32);
|
I don't know what compiler you are using because these files (ioapi.c, zip.c and unzip.c) are successfully compiled on all platforms used by buildbot.
They are not written by me but imported from the MiniZip project (see the copyright in the file headers) and you should contact the authors.
Meanwhile, if you are not interested by zipped tables, you can compile with
CONNECT_WITH_ZIP "Compile CONNECT storage engine with ZIP support" OFF
I don't know if this can be specified when compiling, if not you have to edit the CMakeLists.txt of the CONNECT plugin to do so.