From 36fa081cfe84b9edc9a638a0fccd38ae5bb85db9 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Thu, 29 Aug 2019 18:51:03 +0200 Subject: [PATCH 1/3] Drop support for Visual Studio <=7.1/2003 _MSC_VER 1400 is 8.0/2005 --- expat/Changes | 1 + expat/examples/elements.c | 6 +----- expat/examples/outline.c | 6 +----- expat/lib/expat_external.h | 5 ----- expat/xmlwf/xmlfile.h | 6 +----- 5 files changed, 4 insertions(+), 20 deletions(-) diff --git a/expat/Changes b/expat/Changes index d423b6a7..5481f394 100644 --- a/expat/Changes +++ b/expat/Changes @@ -8,6 +8,7 @@ Release x.x.x xxx xxx xx xxxx when called from inside of an end element handler Other changes: + #325 Windows: Drop support for Visual Studio <=7.1/2003 #286 Windows: Remove COM code from xmlwf; in case it turns out needed later, there will be a dedicated repository below https://github.com/libexpat/ for that code diff --git a/expat/examples/elements.c b/expat/examples/elements.c index ed44b7df..dfc434f7 100644 --- a/expat/examples/elements.c +++ b/expat/examples/elements.c @@ -38,11 +38,7 @@ #include #ifdef XML_LARGE_SIZE -# if defined(XML_USE_MSC_EXTENSIONS) && _MSC_VER < 1400 -# define XML_FMT_INT_MOD "I64" -# else -# define XML_FMT_INT_MOD "ll" -# endif +# define XML_FMT_INT_MOD "ll" #else # define XML_FMT_INT_MOD "l" #endif diff --git a/expat/examples/outline.c b/expat/examples/outline.c index 2136c3d3..d996b8e3 100644 --- a/expat/examples/outline.c +++ b/expat/examples/outline.c @@ -36,11 +36,7 @@ #include #ifdef XML_LARGE_SIZE -# if defined(XML_USE_MSC_EXTENSIONS) && _MSC_VER < 1400 -# define XML_FMT_INT_MOD "I64" -# else -# define XML_FMT_INT_MOD "ll" -# endif +# define XML_FMT_INT_MOD "ll" #else # define XML_FMT_INT_MOD "l" #endif diff --git a/expat/lib/expat_external.h b/expat/lib/expat_external.h index 48a8e5ff..11f49a75 100644 --- a/expat/lib/expat_external.h +++ b/expat/lib/expat_external.h @@ -148,13 +148,8 @@ typedef char XML_LChar; #endif /* XML_UNICODE */ #ifdef XML_LARGE_SIZE /* Use large integers for file/stream positions. */ -# if defined(XML_USE_MSC_EXTENSIONS) && _MSC_VER < 1400 -typedef __int64 XML_Index; -typedef unsigned __int64 XML_Size; -# else typedef long long XML_Index; typedef unsigned long long XML_Size; -# endif #else typedef long XML_Index; typedef unsigned long XML_Size; diff --git a/expat/xmlwf/xmlfile.h b/expat/xmlwf/xmlfile.h index 3a7d81a2..6e5d5b49 100644 --- a/expat/xmlwf/xmlfile.h +++ b/expat/xmlwf/xmlfile.h @@ -34,11 +34,7 @@ #define XML_EXTERNAL_ENTITIES 02 #ifdef XML_LARGE_SIZE -# if defined(XML_USE_MSC_EXTENSIONS) && _MSC_VER < 1400 -# define XML_FMT_INT_MOD "I64" -# else -# define XML_FMT_INT_MOD "ll" -# endif +# define XML_FMT_INT_MOD "ll" #else # define XML_FMT_INT_MOD "l" #endif From 00dabedd002365647832f5453e4ed1788ab808d5 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Thu, 29 Aug 2019 19:25:51 +0200 Subject: [PATCH 2/3] expat_external.h: Inline remains of XML_USE_MSC_EXTENSIONS --- expat/lib/expat_external.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/expat/lib/expat_external.h b/expat/lib/expat_external.h index 11f49a75..b3b6e74d 100644 --- a/expat/lib/expat_external.h +++ b/expat/lib/expat_external.h @@ -35,10 +35,6 @@ /* External API definitions */ -#if defined(_MSC_EXTENSIONS) && ! defined(__BEOS__) && ! defined(__CYGWIN__) -# define XML_USE_MSC_EXTENSIONS 1 -#endif - /* Expat tries very hard to make the API boundary very specifically defined. There are two macros defined to control this boundary; each of these can be defined before including this header to @@ -85,7 +81,7 @@ # ifndef XML_BUILDING_EXPAT /* using Expat from an application */ -# ifdef XML_USE_MSC_EXTENSIONS +# if defined(_MSC_EXTENSIONS) && ! defined(__BEOS__) && ! defined(__CYGWIN__) # define XMLIMPORT __declspec(dllimport) # endif From 89d17f0d1f5f6ce985de7fe0759f5e50a8bf36ab Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Thu, 29 Aug 2019 19:23:47 +0200 Subject: [PATCH 3/3] README.md: Document supported compilers --- expat/Changes | 1 + expat/README.md | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/expat/Changes b/expat/Changes index 5481f394..36c96158 100644 --- a/expat/Changes +++ b/expat/Changes @@ -9,6 +9,7 @@ Release x.x.x xxx xxx xx xxxx Other changes: #325 Windows: Drop support for Visual Studio <=7.1/2003 + and document supported compilers in README.md #286 Windows: Remove COM code from xmlwf; in case it turns out needed later, there will be a dedicated repository below https://github.com/libexpat/ for that code diff --git a/expat/README.md b/expat/README.md index fd3911eb..762b515b 100644 --- a/expat/README.md +++ b/expat/README.md @@ -13,6 +13,11 @@ are called when the parser discovers the associated structures in the document being parsed. A start tag is an example of the kind of structures for which you may register handlers. +Expat supports the following compilers: +- GNU GCC >=4.5 +- LLVM Clang >=3.5 +- Microsoft Visual Studio >=8.0/2005 + Windows users should use the [`expat_win32` package](https://sourceforge.net/projects/expat/files/expat_win32/), which includes both precompiled libraries and executables, and source code for