Commit f091e0d4 authored by Rafaël Carré's avatar Rafaël Carré

contrib: xml: don't use GetVersionEx on Windows

All the versions we support can use UTF8
parent d88e140e
...@@ -21,6 +21,7 @@ ifdef HAVE_DARWIN_OS ...@@ -21,6 +21,7 @@ ifdef HAVE_DARWIN_OS
$(APPLY) $(SRC)/libxml2/osx-threads.patch $(APPLY) $(SRC)/libxml2/osx-threads.patch
endif endif
$(APPLY) $(SRC)/libxml2/no-tests.patch $(APPLY) $(SRC)/libxml2/no-tests.patch
$(APPLY) $(SRC)/libxml2/win32.patch
$(APPLY) $(SRC)/libxml2/pthread.patch $(APPLY) $(SRC)/libxml2/pthread.patch
$(MOVE) $(MOVE)
......
--- libxml2/xmlIO.c.orig 2013-04-22 19:24:23.613036400 +0200
+++ libxml2/xmlIO.c 2013-04-22 19:24:56.249035859 +0200
@@ -726,14 +726,14 @@
xmlInitPlatformSpecificIo(void)
{
static int xmlPlatformIoInitialized = 0;
- OSVERSIONINFO osvi;
+ /*OSVERSIONINFO osvi;*/
if(xmlPlatformIoInitialized)
return;
- osvi.dwOSVersionInfoSize = sizeof(osvi);
+ /*osvi.dwOSVersionInfoSize = sizeof(osvi);*/
- if(GetVersionEx(&osvi) && (osvi.dwPlatformId == VER_PLATFORM_WIN32_NT)) {
+ if(1 /*GetVersionEx(&osvi) && (osvi.dwPlatformId == VER_PLATFORM_WIN32_NT)*/) {
xmlWrapStat = xmlWrapStatUtf8;
xmlWrapOpen = xmlWrapOpenUtf8;
#ifdef HAVE_ZLIB_H
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment