diff options
| author | Daniel Veillard <veillard@src.gnome.org> | 2003-10-11 10:50:10 +0000 |
|---|---|---|
| committer | Daniel Veillard <veillard@src.gnome.org> | 2003-10-11 10:50:10 +0000 |
| commit | c790bf4b36c3a7955351035f636ae93828bf141a (patch) | |
| tree | a5317690815c8850a3bd076bd9661d4f812e09c1 /threads.c | |
| parent | 2b0f8799086f2a54444c618ab3ed01a8177491f2 (diff) | |
| download | android_external_libxml2-c790bf4b36c3a7955351035f636ae93828bf141a.tar.gz android_external_libxml2-c790bf4b36c3a7955351035f636ae93828bf141a.tar.bz2 android_external_libxml2-c790bf4b36c3a7955351035f636ae93828bf141a.zip | |
patch from Mike Hommey applied Windows patch from Jesse Pelton and
* configure.in: patch from Mike Hommey
* threads.c: applied Windows patch from Jesse Pelton and Stephane
Bidoul
* parser.c: fix the potentially nasty access to ctxt->serror
without checking first that the SAX block is version 2
Daniel
Diffstat (limited to 'threads.c')
| -rw-r--r-- | threads.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -541,7 +541,7 @@ xmlInitThreads(void) #ifdef DEBUG_THREADS xmlGenericError(xmlGenericErrorContext, "xmlInitThreads()\n"); #endif -#if defined(HAVE_WIN32_THREADS) && !defined(HAVE_COMPILER_TLS) +#if defined(HAVE_WIN32_THREADS) && !defined(HAVE_COMPILER_TLS) && (!defined(LIBXML_STATIC) || defined(LIBXML_STATIC_FOR_DLL)) InitializeCriticalSection(&cleanup_helpers_cs); #endif } @@ -558,7 +558,7 @@ xmlCleanupThreads(void) #ifdef DEBUG_THREADS xmlGenericError(xmlGenericErrorContext, "xmlCleanupThreads()\n"); #endif -#if defined(HAVE_WIN32_THREADS) && !defined(HAVE_COMPILER_TLS) +#if defined(HAVE_WIN32_THREADS) && !defined(HAVE_COMPILER_TLS) && (!defined(LIBXML_STATIC) || defined(LIBXML_STATIC_FOR_DLL)) if (globalkey != TLS_OUT_OF_INDEXES) { xmlGlobalStateCleanupHelperParams * p; EnterCriticalSection(&cleanup_helpers_cs); |