From aceddf31c9eaaec88b5ee4cab740d2c6645dcadf Mon Sep 17 00:00:00 2001
From: Erik de Castro Lopo <erikd@mega-nerd.com>
Date: Fri, 29 Jan 2016 07:39:12 +1100
Subject: Windows/MSVC utf8 build fixes

Files share/utf8/charset.c and share/utf8/iconvert.c aren't needed
under Windows. This patch removes them from MSVC build system.

Patch-from: lvqcl <lvqcl.mail@gmail.com>
---
 src/share/utf8/charset.c                   |  2 +-
 src/share/utf8/iconvert.c                  |  2 +-
 src/share/utf8/utf8.c                      |  2 +-
 src/share/utf8/utf8_static.vcproj          | 20 --------------------
 src/share/utf8/utf8_static.vcxproj         |  5 -----
 src/share/utf8/utf8_static.vcxproj.filters | 15 ---------------
 6 files changed, 3 insertions(+), 43 deletions(-)

diff --git a/src/share/utf8/charset.c b/src/share/utf8/charset.c
index 3e8d8ec2..5a2a6e49 100644
--- a/src/share/utf8/charset.c
+++ b/src/share/utf8/charset.c
@@ -31,7 +31,7 @@
 #  include <config.h>
 #endif
 
-#ifndef HAVE_ICONV /* should be ifdef USE_CHARSET_CONVERT */
+#if !defined _WIN32 && !defined HAVE_ICONV /* should be && defined USE_CHARSET_CONVERT */
 
 #include <stdlib.h>
 
diff --git a/src/share/utf8/iconvert.c b/src/share/utf8/iconvert.c
index f76c18b1..472ca876 100644
--- a/src/share/utf8/iconvert.c
+++ b/src/share/utf8/iconvert.c
@@ -20,7 +20,7 @@
 #  include <config.h>
 #endif
 
-#ifdef HAVE_ICONV
+#if !defined _WIN32 && defined HAVE_ICONV
 
 #include <assert.h>
 #include <errno.h>
diff --git a/src/share/utf8/utf8.c b/src/share/utf8/utf8.c
index fbac9323..f886e322 100644
--- a/src/share/utf8/utf8.c
+++ b/src/share/utf8/utf8.c
@@ -33,7 +33,6 @@
 #include "share/alloc.h"
 #include "share/safe_str.h"
 #include "share/utf8.h"
-#include "charset.h"
 
 
 #ifdef _WIN32
@@ -247,6 +246,7 @@ int utf8_decode(const char *from, char **to)
 #endif
 
 #include "iconvert.h"
+#include "charset.h"
 
 static const char *current_charset(void)
 {
diff --git a/src/share/utf8/utf8_static.vcproj b/src/share/utf8/utf8_static.vcproj
index 9f878109..87b8ad5d 100644
--- a/src/share/utf8/utf8_static.vcproj
+++ b/src/share/utf8/utf8_static.vcproj
@@ -155,18 +155,6 @@
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
-			<File
-				RelativePath=".\charmaps.h"
-				>
-			</File>
-			<File
-				RelativePath=".\charset.h"
-				>
-			</File>
-			<File
-				RelativePath=".\charsetmap.h"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="Public Header Files"
@@ -181,14 +169,6 @@
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
-			<File
-				RelativePath=".\charset.c"
-				>
-			</File>
-			<File
-				RelativePath=".\iconvert.c"
-				>
-			</File>
 			<File
 				RelativePath=".\utf8.c"
 				>
diff --git a/src/share/utf8/utf8_static.vcxproj b/src/share/utf8/utf8_static.vcxproj
index 53e1c1ed..5298e924 100644
--- a/src/share/utf8/utf8_static.vcxproj
+++ b/src/share/utf8/utf8_static.vcxproj
@@ -130,13 +130,8 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\include\share\utf8.h" />
-    <ClInclude Include="charmaps.h" />
-    <ClInclude Include="charset.h" />
-    <ClInclude Include="charsetmap.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="charset.c" />
-    <ClCompile Include="iconvert.c" />
     <ClCompile Include="utf8.c" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/src/share/utf8/utf8_static.vcxproj.filters b/src/share/utf8/utf8_static.vcxproj.filters
index 78ba12b6..dfbaa99c 100644
--- a/src/share/utf8/utf8_static.vcxproj.filters
+++ b/src/share/utf8/utf8_static.vcxproj.filters
@@ -14,26 +14,11 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="charmaps.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="charset.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="charsetmap.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\include\share\utf8.h">
       <Filter>Public Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="charset.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="iconvert.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="utf8.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-- 
cgit v1.2.1