Commit aceddf31 authored by Erik de Castro Lopo's avatar Erik de Castro Lopo
Browse files

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>
parent 4288e446
......@@ -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>
......
......@@ -20,7 +20,7 @@
# include <config.h>
#endif
#ifdef HAVE_ICONV
#if !defined _WIN32 && defined HAVE_ICONV
#include <assert.h>
#include <errno.h>
......
......@@ -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)
{
......
......@@ -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"
>
......
......@@ -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" />
......
......@@ -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>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment