From b9a4a5e22ee1798ce8746479dfa86f96614454a3 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Sun, 7 Nov 2010 22:55:11 +0000 Subject: [PATCH] Building a static version of the library did not work on Windows (STR #112) --- CHANGES | 4 +++- mxml-private.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 57bd716..c962908 100644 --- a/CHANGES +++ b/CHANGES @@ -1,10 +1,12 @@ -CHANGES - 2010-09-19 +CHANGES - 2010-11-07 -------------------- CHANGES IN Mini-XML 2.7 - Updated the source headers to reference the Mini-XML license and its exceptions to the LGPL2 (STR #108) + - Building a static version of the library did not work on Windows + (STR #112) - The shared library did not include a destructor for the thread- specific data key on UNIX-based operating systems (STR #103) - mxmlLoad* did not error out on XML with multiple root nodes (STR #101) diff --git a/mxml-private.c b/mxml-private.c index 48e7581..9604c9a 100644 --- a/mxml-private.c +++ b/mxml-private.c @@ -229,7 +229,7 @@ _mxml_init(void) } -#elif defined(WIN32) /**** WIN32 threading ****/ +#elif defined(WIN32) && defined(MXML1_EXPORTS) /**** WIN32 threading ****/ # include static DWORD _mxml_tls_index; /* Index for global storage */