summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--appveyor.yml52
-rw-r--r--expat/Changes4
-rw-r--r--expat/README.md2
-rw-r--r--expat/lib/siphash.h13
-rw-r--r--expat/lib/xmlparse.c12
-rw-r--r--expat/lib/xmltok.c10
-rw-r--r--expat/tests/runtests.c22
-rw-r--r--expat/win32/README.txt2
8 files changed, 14 insertions, 103 deletions
diff --git a/appveyor.yml b/appveyor.yml
index 56141735..f1691dd4 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -51,58 +51,6 @@ configuration: Debug
# https://cmake.org/cmake/help/latest/manual/cmake-generators.7.html#visual-studio-generators
environment:
matrix:
- # Visual Studio 2010 Win32
- - GENERATOR: Visual Studio 10 2010
- PLATFORM: Win32
- EXPAT_DLL: libexpatd.dll
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
-
- # Visual Studio 2010 Win32 XML_UNICODE_WCHAR_T
- - GENERATOR: Visual Studio 10 2010
- PLATFORM: Win32
- CMAKE_ARGS: -DEXPAT_CHAR_TYPE=wchar_t
- EXPAT_DLL: libexpatwd.dll
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
-
- # Visual Studio 2010 x64
- - GENERATOR: Visual Studio 10 2010 Win64
- PLATFORM: x64
- EXPAT_DLL: libexpatd.dll
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
-
- # Visual Studio 2010 x64 XML_UNICODE_WCHAR_T
- - GENERATOR: Visual Studio 10 2010 Win64
- PLATFORM: x64
- CMAKE_ARGS: -DEXPAT_CHAR_TYPE=wchar_t
- EXPAT_DLL: libexpatwd.dll
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
-
- # Visual Studio 2012 Win32
- - GENERATOR: Visual Studio 11 2012
- PLATFORM: Win32
- EXPAT_DLL: libexpatd.dll
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
-
- # Visual Studio 2012 Win32 XML_UNICODE_WCHAR_T
- - GENERATOR: Visual Studio 11 2012
- PLATFORM: Win32
- CMAKE_ARGS: -DEXPAT_CHAR_TYPE=wchar_t
- EXPAT_DLL: libexpatwd.dll
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
-
- # Visual Studio 2012 x64
- - GENERATOR: Visual Studio 11 2012 Win64
- PLATFORM: x64
- EXPAT_DLL: libexpatd.dll
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
-
- # Visual Studio 2012 x64 XML_UNICODE_WCHAR_T
- - GENERATOR: Visual Studio 11 2012 Win64
- PLATFORM: x64
- CMAKE_ARGS: -DEXPAT_CHAR_TYPE=wchar_t
- EXPAT_DLL: libexpatwd.dll
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
-
# Visual Studio 2013 Win32
- GENERATOR: Visual Studio 12 2013
PLATFORM: Win32
diff --git a/expat/Changes b/expat/Changes
index b74a7c56..6fd42ea4 100644
--- a/expat/Changes
+++ b/expat/Changes
@@ -2,6 +2,10 @@ NOTE: We are looking for help with a few things:
https://github.com/libexpat/libexpat/labels/help%20wanted
If you can help, please get in touch. Thanks!
+Release x.x.xx xxx xxxxxxx xx xxxx
+ Other changes:
+ #422 Windows: Drop support for Visual Studio <=11.0/2012
+
Release 2.2.10 Sat October 3 2020
Bug fixes:
#390 #395 #398 Fix undefined behavior during parsing caused by
diff --git a/expat/README.md b/expat/README.md
index 428a11ab..dd46ce0a 100644
--- a/expat/README.md
+++ b/expat/README.md
@@ -16,7 +16,7 @@ structures for which you may register handlers.
Expat supports the following compilers:
- GNU GCC >=4.5
- LLVM Clang >=3.5
-- Microsoft Visual Studio >=9.0/2008
+- Microsoft Visual Studio >=12.0/2013
Windows users can use the
[`expat_win32` package](https://sourceforge.net/projects/expat/files/expat_win32/),
diff --git a/expat/lib/siphash.h b/expat/lib/siphash.h
index bfee65a3..e5406d7e 100644
--- a/expat/lib/siphash.h
+++ b/expat/lib/siphash.h
@@ -11,6 +11,9 @@
* --------------------------------------------------------------------------
* HISTORY:
*
+ * 2020-10-03 (Sebastian Pipping)
+ * - Drop support for Visual Studio 9.0/2008 and earlier
+ *
* 2019-08-03 (Sebastian Pipping)
* - Mark part of sip24_valid as to be excluded from clang-format
* - Re-format code using clang-format 9
@@ -96,15 +99,7 @@
#define SIPHASH_H
#include <stddef.h> /* size_t */
-
-#if defined(_WIN32) && defined(_MSC_VER) && (_MSC_VER < 1600)
-/* For vs2003/7.1 up to vs2008/9.0; _MSC_VER 1600 is vs2010/10.0 */
-typedef unsigned __int8 uint8_t;
-typedef unsigned __int32 uint32_t;
-typedef unsigned __int64 uint64_t;
-#else
-# include <stdint.h> /* uint64_t uint32_t uint8_t */
-#endif
+#include <stdint.h> /* uint64_t uint32_t uint8_t */
/*
* Workaround to not require a C++11 compiler for using ULL suffix
diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c
index dfc316ca..e0ef9901 100644
--- a/expat/lib/xmlparse.c
+++ b/expat/lib/xmlparse.c
@@ -47,17 +47,7 @@
#include <limits.h> /* UINT_MAX */
#include <stdio.h> /* fprintf */
#include <stdlib.h> /* getenv, rand_s */
-
-#if defined(_WIN32) && defined(_MSC_VER) && (_MSC_VER < 1600)
-/* vs2008/9.0 and earlier lack stdint.h; _MSC_VER 1600 is vs2010/10.0 */
-# if defined(_WIN64)
-typedef unsigned __int64 uintptr_t;
-# else
-typedef unsigned __int32 uintptr_t;
-# endif
-#else
-# include <stdint.h> /* uintptr_t */
-#endif
+#include <stdint.h> /* uintptr_t */
#ifdef _WIN32
# define getpid GetCurrentProcessId
diff --git a/expat/lib/xmltok.c b/expat/lib/xmltok.c
index c4f9897f..58dce909 100644
--- a/expat/lib/xmltok.c
+++ b/expat/lib/xmltok.c
@@ -32,15 +32,7 @@
#include <stddef.h>
#include <string.h> /* memcpy */
-
-#if defined(_MSC_VER) && (_MSC_VER <= 1700)
-/* for vs2012/11.0/1700 and earlier Visual Studio compilers */
-# define bool int
-# define false 0
-# define true 1
-#else
-# include <stdbool.h>
-#endif
+#include <stdbool.h>
#ifdef _WIN32
# include "winconfig.h"
diff --git a/expat/tests/runtests.c b/expat/tests/runtests.c
index 2490d86b..ffe9add5 100644
--- a/expat/tests/runtests.c
+++ b/expat/tests/runtests.c
@@ -45,28 +45,10 @@
#include <stddef.h> /* ptrdiff_t */
#include <ctype.h>
#include <limits.h>
-
-#if defined(_WIN32) && defined(_MSC_VER) && (_MSC_VER < 1600)
-/* For vs2003/7.1 up to vs2008/9.0; _MSC_VER 1600 is vs2010/10.0 */
-# if defined(_WIN64)
-typedef __int64 intptr_t;
-# else
-typedef __int32 intptr_t;
-# endif
-typedef unsigned __int64 uint64_t;
-#else
-# include <stdint.h> /* intptr_t uint64_t */
-#endif
+#include <stdint.h> /* intptr_t uint64_t */
#if ! defined(__cplusplus)
-# if defined(_MSC_VER) && (_MSC_VER <= 1700)
-/* for vs2012/11.0/1700 and earlier Visual Studio compilers */
-# define bool int
-# define false 0
-# define true 1
-# else
-# include <stdbool.h>
-# endif
+# include <stdbool.h>
#endif
#include "expat.h"
diff --git a/expat/win32/README.txt b/expat/win32/README.txt
index d1069cdd..1d725f38 100644
--- a/expat/win32/README.txt
+++ b/expat/win32/README.txt
@@ -5,7 +5,7 @@ Expat can be built on Windows in two ways:
* Cygwin:
This follows the Unix build procedures.
-* MS Visual Studio 2008, 2010, 2013, 2015 and 2017:
+* MS Visual Studio 2013, 2015 and 2017:
Use CMake to generate a solution file for Visual Studio, then use msbuild
to compile. For example:
View Lorry Controller Status