From 5e9d9dc2f9feaaeca826b767074e6bab96421ead Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C4=83t=C4=83lin=20R=C4=83ceanu?= Date: Mon, 17 Jul 2017 02:54:13 +0300 Subject: [PATCH] Define XML_STATIC in Expat header rather than Expat projects. This defines XML_STATIC unconditionally in Expat sources themselves as the built-in Expat is always used as a static library, so this solution is simpler and more portable. --- src/expat/lib/expat_external.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/expat/lib/expat_external.h b/src/expat/lib/expat_external.h index 892eb4bbed..4dea926593 100644 --- a/src/expat/lib/expat_external.h +++ b/src/expat/lib/expat_external.h @@ -5,6 +5,13 @@ #ifndef Expat_External_INCLUDED #define Expat_External_INCLUDED 1 +/* wxWidgets modification: always predefine XML_STATIC as we always use + Expat as a static library. +*/ +#ifndef XML_STATIC +#define XML_STATIC +#endif + /* External API definitions */ #if defined(_MSC_EXTENSIONS) && !defined(__BEOS__) && !defined(__CYGWIN__)