Revert "Update from expat 2.1.0 to version 2.2.1..."

This reverts commit 2b146bf543, reversing changes made to 138c188fb4.
2025-11-27 15:50:10 +01:00 · 2017-06-29 11:27:12 -04:00
parent f3e31eca8b
commit f6d92ece82
85 changed files with 882 additions and 8074 deletions
--- a/lib-src/expat/xmlwf/.gitignore
+++ b/lib-src/expat/xmlwf/.gitignore
@@ -1,6 +0,0 @@
-Debug
-Release
-xmlwf.plg
-Makefile
-xmlwf
-.libs
--- a/lib-src/expat/xmlwf/codepage.c
+++ b/lib-src/expat/xmlwf/codepage.c
@@ -3,9 +3,8 @@
 */

 #include "codepage.h"
-#include "internal.h"  /* for UNUSED_P only */

-#if defined(_WIN32)
+#if (defined(WIN32) || (defined(__WATCOMC__) && defined(__NT__)))
 #define STRICT 1
 #define WIN32_LEAN_AND_MEAN 1

@@ -52,18 +51,18 @@ codepageConvert(int cp, const char *p)
  return -1;
 }

-#else /* not _WIN32 */
+#else /* not WIN32 */

 int
-codepageMap(int UNUSED_P(cp), int *UNUSED_P(map))
+codepageMap(int cp, int *map)
 {
  return 0;
 }

 int
-codepageConvert(int UNUSED_P(cp), const char *UNUSED_P(p))
+codepageConvert(int cp, const char *p)
 {
  return -1;
 }

-#endif /* not _WIN32 */
+#endif /* not WIN32 */
--- a/lib-src/expat/xmlwf/filemap.h
+++ b/lib-src/expat/xmlwf/filemap.h
@@ -2,20 +2,8 @@
   See the file COPYING for copying permission.
 */

-#include <limits.h>  /* INT_MAX */
 #include <stddef.h>

-
-/* The following limit (for XML_Parse's int len) derives from
- * this loop in xmparse.c:
- *
- *    do {
- *      bufferSize = (int) (2U * (unsigned) bufferSize);
- *    } while (bufferSize < neededSize && bufferSize > 0);
- */
-#define XML_MAX_CHUNK_LEN  (INT_MAX / 2 + 1)
-
-
 #ifdef XML_UNICODE
 int filemap(const wchar_t *name,
            void (*processor)(const void *, size_t,
--- a/lib-src/expat/xmlwf/readfilemap.c
+++ b/lib-src/expat/xmlwf/readfilemap.c
@@ -8,9 +8,16 @@
 #include <stdlib.h>
 #include <stdio.h>

-/* Functions close(2) and read(2) */
-#if !defined(_WIN32) && !defined(_WIN64)
-# include <unistd.h>
+#ifdef __WATCOMC__
+#ifndef __LINUX__
+#include <io.h>
+#else
+#include <unistd.h>
+#endif
+#endif
+
+#ifdef __BEOS__
+#include <unistd.h>
 #endif

 #ifndef S_ISREG
@@ -59,11 +66,6 @@ filemap(const char *name,
    close(fd);
    return 0;
  }
-  if (sb.st_size > XML_MAX_CHUNK_LEN) {
-    close(fd);
-    return 2;  /* Cannot be passed to XML_Parse in one go */
-  }
-
  nbytes = sb.st_size;
  /* malloc will return NULL with nbytes == 0, handle files with size 0 */
  if (nbytes == 0) {
--- a/lib-src/expat/xmlwf/unixfilemap.c
+++ b/lib-src/expat/xmlwf/unixfilemap.c
@@ -42,10 +42,6 @@ filemap(const char *name,
    fprintf(stderr, "%s: not a regular file\n", name);
    return 0;
  }
-  if (sb.st_size > XML_MAX_CHUNK_LEN) {
-    close(fd);
-    return 2;  /* Cannot be passed to XML_Parse in one go */
-  }

  nbytes = sb.st_size;
  /* mmap fails for zero length files */
@@ -55,7 +51,7 @@ filemap(const char *name,
    close(fd);
    return 1;
  }
-  p = (void *)mmap((void *)0, (size_t)nbytes, PROT_READ,
+  p = (void *)mmap((caddr_t)0, (size_t)nbytes, PROT_READ,
                   MAP_FILE|MAP_PRIVATE, fd, (off_t)0);
  if (p == (void *)-1) {
    perror(name);
@@ -63,7 +59,7 @@ filemap(const char *name,
    return 0;
  }
  processor(p, nbytes, name, arg);
-  munmap((void *)p, nbytes);
+  munmap((caddr_t)p, nbytes);
  close(fd);
  return 1;
 }
--- a/lib-src/expat/xmlwf/win32filemap.c
+++ b/lib-src/expat/xmlwf/win32filemap.c
@@ -42,12 +42,11 @@ filemap(const TCHAR *name,
  size = GetFileSize(f, &sizeHi);
  if (size == (DWORD)-1) {
    win32perror(name);
-    CloseHandle(f);
    return 0;
  }
-  if (sizeHi || (size > XML_MAX_CHUNK_LEN)) {
-    CloseHandle(f);
-    return 2;  /* Cannot be passed to XML_Parse in one go */
+  if (sizeHi) {
+    _ftprintf(stderr, _T("%s: bigger than 2Gb\n"), name);
+    return 0;
  }
  /* CreateFileMapping barfs on zero length files */
  if (size == 0) {
--- a/lib-src/expat/xmlwf/xmlfile.c
+++ b/lib-src/expat/xmlwf/xmlfile.c
@@ -8,22 +8,31 @@
 #include <string.h>
 #include <fcntl.h>

-#ifdef _WIN32
+#ifdef COMPILED_FROM_DSP
 #include "winconfig.h"
+#elif defined(MACOS_CLASSIC)
+#include "macconfig.h"
+#elif defined(__amigaos__)
+#include "amigaconfig.h"
+#elif defined(__WATCOMC__)
+#include "watcomconfig.h"
 #elif defined(HAVE_EXPAT_CONFIG_H)
 #include <expat_config.h>
-#endif /* ndef _WIN32 */
+#endif /* ndef COMPILED_FROM_DSP */

 #include "expat.h"
-#include "internal.h"  /* for UNUSED_P only */
 #include "xmlfile.h"
 #include "xmltchar.h"
 #include "filemap.h"

-#if defined(_MSC_VER)
+#if (defined(_MSC_VER) || (defined(__WATCOMC__) && !defined(__LINUX__)))
 #include <io.h>
 #endif

+#if defined(__amigaos__) && defined(__USE_INLINE__)
+#include <proto/expat.h>
+#endif
+
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
@@ -48,9 +57,6 @@ typedef struct {
  int *retPtr;
 } PROCESS_ARGS;

-static int
-processStream(const XML_Char *filename, XML_Parser parser);
-
 static void
 reportError(XML_Parser parser, const XML_Char *filename)
 {
@@ -81,7 +87,7 @@ processFile(const void *data, size_t size,
    *retPtr = 1;
 }

-#if defined(_WIN32)
+#if (defined(WIN32) || defined(__WATCOMC__))

 static int
 isAsciiLetter(XML_Char c)
@@ -89,7 +95,7 @@ isAsciiLetter(XML_Char c)
  return (T('a') <= c && c <= T('z')) || (T('A') <= c && c <= T('Z'));
 }

-#endif /* _WIN32 */
+#endif /* WIN32 */

 static const XML_Char *
 resolveSystemId(const XML_Char *base, const XML_Char *systemId,
@@ -99,7 +105,7 @@ resolveSystemId(const XML_Char *base, const XML_Char *systemId,
  *toFree = 0;
  if (!base
      || *systemId == T('/')
-#if defined(_WIN32)
+#if (defined(WIN32) || defined(__WATCOMC__))
      || *systemId == T('\\')
      || (isAsciiLetter(systemId[0]) && systemId[1] == T(':'))
 #endif
@@ -113,7 +119,7 @@ resolveSystemId(const XML_Char *base, const XML_Char *systemId,
  s = *toFree;
  if (tcsrchr(s, T('/')))
    s = tcsrchr(s, T('/')) + 1;
-#if defined(_WIN32)
+#if (defined(WIN32) || defined(__WATCOMC__))
  if (tcsrchr(s, T('\\')))
    s = tcsrchr(s, T('\\')) + 1;
 #endif
@@ -126,29 +132,19 @@ externalEntityRefFilemap(XML_Parser parser,
                         const XML_Char *context,
                         const XML_Char *base,
                         const XML_Char *systemId,
-                         const XML_Char *UNUSED_P(publicId))
+                         const XML_Char *publicId)
 {
  int result;
  XML_Char *s;
  const XML_Char *filename;
  XML_Parser entParser = XML_ExternalEntityParserCreate(parser, context, 0);
-  int filemapRes;
  PROCESS_ARGS args;
  args.retPtr = &result;
  args.parser = entParser;
  filename = resolveSystemId(base, systemId, &s);
  XML_SetBase(entParser, filename);
-  filemapRes = filemap(filename, processFile, &args);
-  switch (filemapRes) {
-  case 0:
+  if (!filemap(filename, processFile, &args))
    result = 0;
-    break;
-  case 2:
-    ftprintf(stderr, T("%s: file too large for memory-mapping")
-        T(", switching to streaming\n"), filename);
-    result = processStream(filename, entParser);
-    break;
-  }
  free(s);
  XML_ParserFree(entParser);
  return result;
@@ -204,7 +200,7 @@ externalEntityRefStream(XML_Parser parser,
                        const XML_Char *context,
                        const XML_Char *base,
                        const XML_Char *systemId,
-                        const XML_Char *UNUSED_P(publicId))
+                        const XML_Char *publicId)
 {
  XML_Char *s;
  const XML_Char *filename;
@@ -236,21 +232,11 @@ XML_ProcessFile(XML_Parser parser,
                                      ? externalEntityRefFilemap
                                      : externalEntityRefStream);
  if (flags & XML_MAP_FILE) {
-    int filemapRes;
    PROCESS_ARGS args;
    args.retPtr = &result;
    args.parser = parser;
-    filemapRes = filemap(filename, processFile, &args);
-    switch (filemapRes) {
-    case 0:
+    if (!filemap(filename, processFile, &args))
      result = 0;
-      break;
-    case 2:
-      ftprintf(stderr, T("%s: file too large for memory-mapping")
-          T(", switching to streaming\n"), filename);
-      result = processStream(filename, parser);
-      break;
-    }
  }
  else
    result = processStream(filename, parser);
--- a/lib-src/expat/xmlwf/xmlwf.c
+++ b/lib-src/expat/xmlwf/xmlwf.c
@@ -9,7 +9,6 @@

 #include "expat.h"
 #include "codepage.h"
-#include "internal.h"  /* for UNUSED_P only */
 #include "xmlfile.h"
 #include "xmltchar.h"

@@ -17,6 +16,10 @@
 #include <crtdbg.h>
 #endif

+#if defined(__amigaos__) && defined(__USE_INLINE__)
+#include <proto/expat.h>
+#endif
+
 /* This ensures proper sorting. */

 #define NSSEP T('\001')
@@ -245,49 +248,49 @@ processingInstruction(void *userData, const XML_Char *target,
 #endif /* not W3C14N */

 static void XMLCALL
-defaultCharacterData(void *userData, const XML_Char *UNUSED_P(s), int UNUSED_P(len))
+defaultCharacterData(void *userData, const XML_Char *s, int len)
 {
  XML_DefaultCurrent((XML_Parser) userData);
 }

 static void XMLCALL
-defaultStartElement(void *userData, const XML_Char *UNUSED_P(name),
-                    const XML_Char **UNUSED_P(atts))
+defaultStartElement(void *userData, const XML_Char *name,
+                    const XML_Char **atts)
 {
  XML_DefaultCurrent((XML_Parser) userData);
 }

 static void XMLCALL
-defaultEndElement(void *userData, const XML_Char *UNUSED_P(name))
+defaultEndElement(void *userData, const XML_Char *name)
 {
  XML_DefaultCurrent((XML_Parser) userData);
 }

 static void XMLCALL
-defaultProcessingInstruction(void *userData, const XML_Char *UNUSED_P(target),
-                             const XML_Char *UNUSED_P(data))
+defaultProcessingInstruction(void *userData, const XML_Char *target,
+                             const XML_Char *data)
 {
  XML_DefaultCurrent((XML_Parser) userData);
 }

 static void XMLCALL
-nopCharacterData(void *UNUSED_P(userData), const XML_Char *UNUSED_P(s), int UNUSED_P(len))
+nopCharacterData(void *userData, const XML_Char *s, int len)
 {
 }

 static void XMLCALL
-nopStartElement(void *UNUSED_P(userData), const XML_Char *UNUSED_P(name), const XML_Char **UNUSED_P(atts))
+nopStartElement(void *userData, const XML_Char *name, const XML_Char **atts)
 {
 }

 static void XMLCALL
-nopEndElement(void *UNUSED_P(userData), const XML_Char *UNUSED_P(name))
+nopEndElement(void *userData, const XML_Char *name)
 {
 }

 static void XMLCALL
-nopProcessingInstruction(void *UNUSED_P(userData), const XML_Char *UNUSED_P(target),
-                         const XML_Char *UNUSED_P(data))
+nopProcessingInstruction(void *userData, const XML_Char *target,
+                         const XML_Char *data)
 {
 }

@@ -431,9 +434,9 @@ metaCharacterData(void *userData, const XML_Char *s, int len)
 static void XMLCALL
 metaStartDoctypeDecl(void *userData,
                     const XML_Char *doctypeName,
-                     const XML_Char *UNUSED_P(sysid),
-                     const XML_Char *UNUSED_P(pubid),
-                     int UNUSED_P(has_internal_subset))
+                     const XML_Char *sysid,
+                     const XML_Char *pubid,
+                     int has_internal_subset)
 {
  XML_Parser parser = (XML_Parser) userData;
  FILE *fp = (FILE *)XML_GetUserData(parser);
@@ -455,7 +458,7 @@ metaEndDoctypeDecl(void *userData)
 static void XMLCALL
 metaNotationDecl(void *userData,
                 const XML_Char *notationName,
-                 const XML_Char *UNUSED_P(base),
+                 const XML_Char *base,
                 const XML_Char *systemId,
                 const XML_Char *publicId)
 {
@@ -477,10 +480,10 @@ metaNotationDecl(void *userData,
 static void XMLCALL
 metaEntityDecl(void *userData,
               const XML_Char *entityName,
-               int  UNUSED_P(is_param),
+               int  is_param,
               const XML_Char *value,
               int  value_length,
-               const XML_Char *UNUSED_P(base),
+               const XML_Char *base,
               const XML_Char *systemId,
               const XML_Char *publicId,
               const XML_Char *notationName)
@@ -555,7 +558,7 @@ unknownEncodingConvert(void *data, const char *p)
 }

 static int XMLCALL
-unknownEncoding(void *UNUSED_P(userData), const XML_Char *name, XML_Encoding *info)
+unknownEncoding(void *userData, const XML_Char *name, XML_Encoding *info)
 {
  int cp;
  static const XML_Char prefixL[] = T("windows-");
@@ -591,7 +594,7 @@ unknownEncoding(void *UNUSED_P(userData), const XML_Char *name, XML_Encoding *in
 }

 static int XMLCALL
-notStandalone(void *UNUSED_P(userData))
+notStandalone(void *userData)
 {
  return 0;
 }
@@ -604,7 +607,7 @@ showVersion(XML_Char *prog)
  const XML_Feature *features = XML_GetFeatureList();
  while ((ch = *s) != 0) {
    if (ch == '/'
-#if defined(_WIN32)
+#if (defined(WIN32) || defined(__WATCOMC__))
        || ch == '\\'
 #endif
        )
@@ -631,7 +634,8 @@ static void
 usage(const XML_Char *prog, int rc)
 {
  ftprintf(stderr,
-           T("usage: %s [-s] [-n] [-p] [-x] [-e encoding] [-w] [-d output-dir] [-c] [-m] [-r] [-t] [file ...]\n"), prog);
+           T("usage: %s [-n] [-p] [-r] [-s] [-w] [-x] [-d output-dir] "
+             "[-e encoding] file ...\n"), prog);
  exit(rc);
 }

@@ -756,12 +760,6 @@ tmain(int argc, XML_Char **argv)
      parser = XML_ParserCreateNS(encoding, NSSEP);
    else
      parser = XML_ParserCreate(encoding);
-
-    if (! parser) {
-      tperror("Could not instantiate parser");
-      exit(1);
-    }
-
    if (requireStandalone)
      XML_SetNotStandaloneHandler(parser, notStandalone);
    XML_SetParamEntityParsing(parser, paramEntityParsing);
@@ -781,7 +779,7 @@ tmain(int argc, XML_Char **argv)
        const XML_Char * lastDelim = tcsrchr(file, delim[0]);
        if (lastDelim)
          file = lastDelim + 1;
-#if defined(_WIN32)
+#if (defined(WIN32) || defined(__WATCOMC__))
        else {
          const XML_Char * winDelim = T("\\");
          lastDelim = tcsrchr(file, winDelim[0]);
--- a/lib-src/expat/xmlwf/xmlwf.vcxproj
+++ b/lib-src/expat/xmlwf/xmlwf.vcxproj
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Template|Win32">
-      <Configuration>Template</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <SccProjectName />
-    <SccLocalPath />
-    <ProjectGuid>{E3C5991F-5238-4168-A179-275D1AC98D7E}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Template|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>.\..\win32\bin\Release\</OutDir>
-    <IntDir>.\..\win32\tmp\Release-xmlwf\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>.\..\win32\bin\Debug\</OutDir>
-    <IntDir>.\..\win32\tmp\Debug-xmlwf\</IntDir>
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <StringPooling>true</StringPooling>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <Optimization>MaxSpeed</Optimization>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <WarningLevel>Level3</WarningLevel>
-      <AdditionalIncludeDirectories>..\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AssemblerListingLocation>.\..\win32\tmp\Release-xmlwf\</AssemblerListingLocation>
-      <PrecompiledHeaderOutputFile>.\..\win32\tmp\Release-xmlwf\xmlwf.pch</PrecompiledHeaderOutputFile>
-      <PrecompiledHeader />
-      <ObjectFileName>.\..\win32\tmp\Release-xmlwf\</ObjectFileName>
-      <ProgramDataBaseFileName>.\..\win32\tmp\Release-xmlwf\</ProgramDataBaseFileName>
-    </ClCompile>
-    <Midl>
-      <TypeLibraryName>.\..\win32\bin\Release\xmlwf.tlb</TypeLibraryName>
-    </Midl>
-    <ResourceCompile>
-      <Culture>0x0409</Culture>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\..\win32\bin\Release\xmlwf.bsc</OutputFile>
-    </Bscmake>
-    <Link>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <OutputFile>..\win32\bin\Release\xmlwf.exe</OutputFile>
-      <AdditionalLibraryDirectories>..\win32\bin\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libexpat.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <Optimization>Disabled</Optimization>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <AdditionalIncludeDirectories>..\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AssemblerListingLocation>.\..\win32\tmp\Debug-xmlwf\</AssemblerListingLocation>
-      <PrecompiledHeaderOutputFile>.\..\win32\tmp\Debug-xmlwf\xmlwf.pch</PrecompiledHeaderOutputFile>
-      <ObjectFileName>.\..\win32\tmp\Debug-xmlwf\</ObjectFileName>
-      <ProgramDataBaseFileName>.\..\win32\tmp\Debug-xmlwf\</ProgramDataBaseFileName>
-    </ClCompile>
-    <Midl>
-      <TypeLibraryName>.\..\win32\bin\Debug\xmlwf.tlb</TypeLibraryName>
-    </Midl>
-    <ResourceCompile>
-      <Culture>0x0409</Culture>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\..\win32\bin\Debug\xmlwf.bsc</OutputFile>
-    </Bscmake>
-    <Link>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OutputFile>..\win32\bin\Debug\xmlwf.exe</OutputFile>
-      <AdditionalLibraryDirectories>..\win32\bin\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libexpat.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="codepage.c" />
-    <ClCompile Include="readfilemap.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="unixfilemap.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="win32filemap.c" />
-    <ClCompile Include="xmlfile.c" />
-    <ClCompile Include="xmlwf.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="codepage.h" />
-    <ClInclude Include="xmlfile.h" />
-    <ClInclude Include="xmltchar.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\lib\expat.vcxproj">
-      <Project>{45a5074d-66e8-44a4-a03f-018027b528d6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
--- a/lib-src/expat/xmlwf/xmlwf.vcxproj.filters
+++ b/lib-src/expat/xmlwf/xmlwf.vcxproj.filters
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{843deb01-ec59-4070-9fb7-4de851940fbd}</UniqueIdentifier>
-      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;for;f90</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{41225059-d26f-42fd-9d1b-fda760b7e45d}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;fi;fd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{a722469e-558e-4d77-b8ea-88c9f136e29a}</UniqueIdentifier>
-      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="codepage.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="readfilemap.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="unixfilemap.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="win32filemap.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="xmlfile.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="xmlwf.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="codepage.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="xmlfile.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="xmltchar.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>