From 7cf2d79584aba16748ac92b73f60a1e731b0270c Mon Sep 17 00:00:00 2001 From: DjWarmonger Date: Tue, 2 Feb 2016 18:48:20 +0100 Subject: [PATCH] Final compile fix. --- lib/filesystem/FileStream.cpp | 3 --- lib/minizip/ioapi.c | 2 +- lib/minizip/ioapi.h | 4 ++-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/lib/filesystem/FileStream.cpp b/lib/filesystem/FileStream.cpp index eaa8a48c7..560d0312a 100644 --- a/lib/filesystem/FileStream.cpp +++ b/lib/filesystem/FileStream.cpp @@ -7,11 +7,8 @@ #include "../minizip/unzip.h" #endif -#include "../minizip/ioapi.h" - #include - #ifdef VCMI_WINDOWS #ifndef _CRT_SECURE_NO_WARNINGS #define _CRT_SECURE_NO_WARNINGS diff --git a/lib/minizip/ioapi.c b/lib/minizip/ioapi.c index 7f5c191b2..14cf9aae2 100644 --- a/lib/minizip/ioapi.c +++ b/lib/minizip/ioapi.c @@ -234,7 +234,7 @@ void fill_fopen_filefunc (pzlib_filefunc_def) pzlib_filefunc_def->opaque = NULL; } -void fill_fopen64_filefunc (zlib_filefunc64_def* pzlib_filefunc_def) +void fill_fopen64_filefunc(zlib_filefunc64_def* pzlib_filefunc_def) { pzlib_filefunc_def->zopen64_file = fopen64_file_func; pzlib_filefunc_def->zread_file = fread_file_func; diff --git a/lib/minizip/ioapi.h b/lib/minizip/ioapi.h index 4683e36cd..ea1574c28 100644 --- a/lib/minizip/ioapi.h +++ b/lib/minizip/ioapi.h @@ -198,8 +198,8 @@ typedef struct zlib_filefunc64_def_s 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)); +ZEXPORT void fill_fopen64_filefunc OF((zlib_filefunc64_def* pzlib_filefunc_def)); +ZEXPORT void fill_fopen_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def)); /* now internal definition, only for zip.c and unzip.h */ typedef struct zlib_filefunc64_32_def_s