Skip to content

Commit

Permalink
Define XML_STATIC in Expat header rather than Expat projects.
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
catalinr committed Feb 2, 2017
1 parent 881e252 commit 4f1e901
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions src/expat/lib/expat_external.h
Original file line number Diff line number Diff line change
Expand Up @@ -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__)
Expand Down

0 comments on commit 4f1e901

Please sign in to comment.