From 21ef23498946d9e39323919183e4f105baf5e993 Mon Sep 17 00:00:00 2001
From: Mounir IDRASSI <mounir.idrassi@idrix.fr>
Date: Sun, 4 Mar 2018 18:35:07 +0100
Subject: Windows: fix build issue of zip library with Visual Studio 2015/2017

---
 src/Common/Zip.vcxproj         | 3 +--
 src/Common/Zip.vcxproj.filters | 3 ---
 src/Common/libzip/config.h     | 2 +-
 3 files changed, 2 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/Common/Zip.vcxproj b/src/Common/Zip.vcxproj
index 3ed43587..15604833 100644
--- a/src/Common/Zip.vcxproj
+++ b/src/Common/Zip.vcxproj
@@ -35,7 +35,6 @@
     <ClCompile Include="libzip\zip_error_get.c" />
     <ClCompile Include="libzip\zip_error_get_sys_type.c" />
     <ClCompile Include="libzip\zip_error_strerror.c" />
-    <ClCompile Include="libzip\zip_error_to_str.c" />
     <ClCompile Include="libzip\zip_err_str.c" />
     <ClCompile Include="libzip\zip_extra_field.c" />
     <ClCompile Include="libzip\zip_extra_field_api.c" />
@@ -223,7 +222,7 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_CRT_NONSTDC_NO_WARNINGS;_LIB;WIN32;HAVE_CONFIG_H;ZIP_STATIC;DEBUG;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <AdditionalIncludeDirectories>zlib:libzip</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>zlib;libzip</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
diff --git a/src/Common/Zip.vcxproj.filters b/src/Common/Zip.vcxproj.filters
index 8cc8b9bd..651be91e 100644
--- a/src/Common/Zip.vcxproj.filters
+++ b/src/Common/Zip.vcxproj.filters
@@ -57,9 +57,6 @@
     <ClCompile Include="libzip\zip_error_strerror.c">
       <Filter>libzip</Filter>
     </ClCompile>
-    <ClCompile Include="libzip\zip_error_to_str.c">
-      <Filter>libzip</Filter>
-    </ClCompile>
     <ClCompile Include="libzip\zip_err_str.c">
       <Filter>libzip</Filter>
     </ClCompile>
diff --git a/src/Common/libzip/config.h b/src/Common/libzip/config.h
index 6212383c..8c6c46a0 100644
--- a/src/Common/libzip/config.h
+++ b/src/Common/libzip/config.h
@@ -11,7 +11,7 @@
 #define HAVE__FILENO
 #define HAVE__OPEN
 #define HAVE__SETMODE
-#define HAVE__SNPRINTF
+/* #undef HAVE__SNPRINTF */
 #define HAVE__STRDUP
 #define HAVE__STRICMP
 #define HAVE__STRTOI64
-- 
cgit v1.2.3