mirrors/vlc
0
0
Fork 0
mirror of https://github.com/videolan/vlc.git synced 2025-01-22 15:47:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

contrib: xml: don't use GetVersionEx on Windows

Browse Source 
All the versions we support can use UTF8
This commit is contained in:
Rafaël Carré 2013-04-22 19:27:42 +02:00
parent d88e140e5c
commit f091e0d453
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/src/libxml2/rules.mak
View File

@ -21,6 +21,7 @@ ifdef HAVE_DARWIN_OS
$(APPLY) $(SRC)/libxml2/osx-threads.patch
endif
$(APPLY) $(SRC)/libxml2/no-tests.patch
$(APPLY) $(SRC)/libxml2/win32.patch
$(APPLY) $(SRC)/libxml2/pthread.patch
$(MOVE)

20
contrib/src/libxml2/win32.patch Normal file
View File

@ -0,0 +1,20 @@
--- 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