diff options
Diffstat (limited to 'external/libxml2/libxml2-icu-sym.patch.0')
| -rw-r--r-- | external/libxml2/libxml2-icu-sym.patch.0 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/external/libxml2/libxml2-icu-sym.patch.0 b/external/libxml2/libxml2-icu-sym.patch.0 index 07676228da19..d89a1c4c544b 100644 --- a/external/libxml2/libxml2-icu-sym.patch.0 +++ b/external/libxml2/libxml2-icu-sym.patch.0 @@ -3,14 +3,14 @@ Find bundled ICU in workdir and use debug .libs when needed diff -up win32/Makefile.msvc.dt win32/Makefile.msvc --- win32/Makefile.msvc.dt 2014-07-18 19:00:23.372103963 +0200 +++ win32/Makefile.msvc 2014-07-18 19:01:39.347982929 +0200 -@@ -46,6 +46,7 @@ CPPFLAGS = $(CPPFLAGS) /D "_REENTRANT" +@@ -42,6 +42,7 @@ CC = cl.exe CFLAGS = /nologo /D "_WINDOWS" /D "_MBCS" /D "NOLIBTOOL" /W3 /wd4244 /wd4267 $(CRUNTIME) CFLAGS = $(CFLAGS) /I$(XML_SRCDIR) /I$(XML_SRCDIR)\include /I$(INCPREFIX) +CFLAGS = $(CFLAGS) /I$(WORKDIR)/UnpackedTarball/icu/source/i18n /I$(WORKDIR)/UnpackedTarball/icu/source/common - !if "$(WITH_THREADS)" != "no" - CFLAGS = $(CFLAGS) /D "_REENTRANT" - !endif + !if "$(WITH_THREADS)" == "ctls" + CFLAGS = $(CFLAGS) /D "XML_THREAD_LOCAL=__declspec(thread)" + !else if "$(WITH_THREADS)" == "posix" @@ -62,7 +63,9 @@ # The linker and its options. LD = link.exe |