Merge branch 'master' of https://github.com/libexpat/libexpat
diff --git a/expat/tests/runtests.vcxproj b/expat/tests/runtests.vcxproj
index 84c58e0..ff8f549 100644
--- a/expat/tests/runtests.vcxproj
+++ b/expat/tests/runtests.vcxproj
@@ -126,7 +126,7 @@
<ItemGroup>
<ClCompile Include="chardata.c" />
<ClCompile Include="minicheck.c" />
- <ClCompile Include="memcheck.h" />
+ <ClCompile Include="memcheck.c" />
<ClCompile Include="runtests.c" />
</ItemGroup>
<ItemGroup>
diff --git a/expat/win32/README.txt b/expat/win32/README.txt
index c6c5bf3..462c49b 100644
--- a/expat/win32/README.txt
+++ b/expat/win32/README.txt
@@ -5,10 +5,10 @@
* Cygwin:
This follows the Unix build procedures.
-* MS Visual Studio 2013 and 2015:
+* MS Visual Studio 2013, 2015 and 2017:
A solution file for Visual Studio 2013 is provided: expat.sln.
The associated project files (*.vcxproj) reside in the appropriate
- project directories. This solution file can be opened in VS 2015
+ project directories. This solution file can be opened in VS 2015 or VS 2017
and should be upgraded automatically if VS 2013 is not also installed.
Note: Tests have their own solution files.
diff --git a/expat/win32/expat.iss b/expat/win32/expat.iss
index 4e4338d..2943d3e 100644
--- a/expat/win32/expat.iss
+++ b/expat/win32/expat.iss
@@ -9,7 +9,7 @@
AppId=expat
AppVersion=2.2.1
AppVerName=Expat 2.2.1
-AppCopyright=Copyright © 1998-2017 Thai Open Source Software Center, Clark Cooper, and the Expat maintainers
+AppCopyright=Copyright � 1998-2017 Thai Open Source Software Center, Clark Cooper, and the Expat maintainers
AppPublisher=The Expat Developers
AppPublisherURL=http://www.libexpat.org/
AppSupportURL=http://www.libexpat.org/
@@ -54,13 +54,11 @@
Flags: ignoreversion; Source: tests\*.c; DestDir: "{app}\Source\tests"
Flags: ignoreversion; Source: tests\*.cpp; DestDir: "{app}\Source\tests"
Flags: ignoreversion; Source: tests\*.h; DestDir: "{app}\Source\tests"
-Flags: ignoreversion; Source: tests\*.ds*; DestDir: "{app}\Source\tests"
Flags: ignoreversion; Source: tests\*.sln; DestDir: "{app}\Source\tests"
Flags: ignoreversion; Source: tests\*.vcxproj; DestDir: "{app}\Source\tests"
Flags: ignoreversion; Source: tests\*.vcxproj.filters; DestDir: "{app}\Source\tests"
Flags: ignoreversion; Source: tests\README.txt; DestDir: "{app}\Source\tests"
Flags: ignoreversion; Source: tests\benchmark\*.c; DestDir: "{app}\Source\tests\benchmark"
-Flags: ignoreversion; Source: tests\benchmark\*.ds*; DestDir: "{app}\Source\tests\benchmark"
Flags: ignoreversion; Source: tests\benchmark\*.sln; DestDir: "{app}\Source\tests\benchmark"
Flags: ignoreversion; Source: tests\benchmark\*.vcxproj; DestDir: "{app}\Source\tests\benchmark"
Flags: ignoreversion; Source: tests\benchmark\README.txt; DestDir: "{app}\Source\tests\benchmark"
