[libxml2] Remove broken Windows CE support
- From: Nick Wellnhofer <nwellnhof src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libxml2] Remove broken Windows CE support
- Date: Tue, 1 Mar 2022 14:33:09 +0000 (UTC)
commit b094e814fa15824fe4764164e53c7be3135b74e1
Author: Nick Wellnhofer <wellnhofer aevum de>
Date: Tue Mar 1 00:02:59 2022 +0100
Remove broken Windows CE support
catalog.c | 6 -
include/wsockcompat.h | 4 -
libxml.h | 8 -
win32/wince/libxml2.vcb | 1 -
win32/wince/libxml2.vcl | 122 --
win32/wince/libxml2.vco | 1 -
win32/wince/libxml2.vcp | 5273 ---------------------------------------------
win32/wince/libxml2.vcw | 41 -
win32/wince/wincecompat.c | 68 -
win32/wince/wincecompat.h | 50 -
xmlIO.c | 8 -
xmlmodule.c | 7 -
12 files changed, 5589 deletions(-)
---
diff --git a/catalog.c b/catalog.c
index f559978c..50e03533 100644
--- a/catalog.c
+++ b/catalog.c
@@ -79,17 +79,11 @@
#if defined(_WIN32) && defined(_MSC_VER)
#undef XML_XML_DEFAULT_CATALOG
static char XML_XML_DEFAULT_CATALOG[256] = "file:///etc/xml/catalog";
-#if defined(_WIN32_WCE)
-/* Windows CE don't have a A variant */
-#define GetModuleHandleA GetModuleHandle
-#define GetModuleFileNameA GetModuleFileName
-#else
#if !defined(_WINDOWS_)
void* __stdcall GetModuleHandleA(const char*);
unsigned long __stdcall GetModuleFileNameA(void*, char*, unsigned long);
#endif
#endif
-#endif
static xmlChar *xmlCatalogNormalizePublic(const xmlChar *pubID);
static int xmlExpandCatalog(xmlCatalogPtr catal, const char *filename);
diff --git a/include/wsockcompat.h b/include/wsockcompat.h
index e57ca8ec..85b9e7d5 100644
--- a/include/wsockcompat.h
+++ b/include/wsockcompat.h
@@ -5,9 +5,6 @@
#if !defined __XML_WSOCKCOMPAT_H__
#define __XML_WSOCKCOMPAT_H__
-#ifdef _WIN32_WCE
-#include <winsock.h>
-#else
#include <errno.h>
#include <winsock2.h>
@@ -30,7 +27,6 @@
#include <wspiapi.h>
#define HAVE_GETADDRINFO
#endif
-#endif
#undef XML_SOCKLEN_T
#define XML_SOCKLEN_T int
diff --git a/libxml.h b/libxml.h
index 38afbefb..0d76298f 100644
--- a/libxml.h
+++ b/libxml.h
@@ -22,14 +22,6 @@
#if defined(macintosh)
#include "config-mac.h"
-#elif defined(_WIN32_WCE)
-/*
- * Windows CE compatibility definitions and functions
- * This is needed to compile libxml2 for Windows CE.
- * At least I tested it with WinCE 5.0 for Emulator and WinCE 4.2/SH4 target
- */
-#include <win32config.h>
-#include <libxml/xmlversion.h>
#else
/*
* Currently supported platforms use either autoconf or
diff --git a/xmlIO.c b/xmlIO.c
index c76365e3..59eb111f 100644
--- a/xmlIO.c
+++ b/xmlIO.c
@@ -45,10 +45,6 @@
#include <windows.h>
#endif
-#if defined(_WIN32_WCE)
-#include <winnls.h> /* for CP_UTF8 */
-#endif
-
#ifndef S_ISDIR
# ifdef _S_ISDIR
# define S_ISDIR(x) _S_ISDIR(x)
@@ -3765,10 +3761,6 @@ xmlParserGetDirectory(const char *filename) {
char dir[1024];
char *cur;
-#ifdef _WIN32_WCE /* easy way by now ... wince does not have dirs! */
- return NULL;
-#endif
-
if (xmlInputCallbackInitialized == 0)
xmlRegisterDefaultInputCallbacks();
diff --git a/xmlmodule.c b/xmlmodule.c
index 592c1c7e..44eba066 100644
--- a/xmlmodule.c
+++ b/xmlmodule.c
@@ -341,14 +341,7 @@ static int
xmlModulePlatformSymbol(void *handle, const char *name, void **symbol)
{
XML_IGNORE_PEDANTIC_WARNINGS
-#ifdef _WIN32_WCE
- /*
- * GetProcAddressA seems only available on WinCE
- */
- *symbol = GetProcAddressA(handle, name);
-#else
*symbol = GetProcAddress(handle, name);
-#endif
return (NULL == *symbol) ? -1 : 0;
XML_POP_WARNINGS
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]