You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
mxe/src/xmlrpc-c-1-fixes.patch

117 lines
3.9 KiB

This file is part of MXE. See LICENSE.md for licensing information.
Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Sat, 18 Nov 2017 23:32:38 +1100
Subject: [PATCH 1/1] fixes
diff --git a/advanced/lib/curl_transport/curltransaction.c b/advanced/lib/curl_transport/curltransaction.c
index 1111111..2222222 100644
--- a/advanced/lib/curl_transport/curltransaction.c
+++ b/advanced/lib/curl_transport/curltransaction.c
@@ -2,8 +2,6 @@
curlTransaction
=============================================================================*/
-#define _XOPEN_SOURCE 600 /* Make sure strdup() is in <string.h> */
-
#include <assert.h>
#include <string.h>
#include <stdlib.h>
diff --git a/advanced/lib/expat/xmlparse/xmlparse.c b/advanced/lib/expat/xmlparse/xmlparse.c
index 1111111..2222222 100644
--- a/advanced/lib/expat/xmlparse/xmlparse.c
+++ b/advanced/lib/expat/xmlparse/xmlparse.c
@@ -4546,14 +4546,6 @@ parseNoBuffer(Parser * const parser,
}
-int
-XML_SetHashSalt(XML_Parser parser,
- unsigned long hash_salt)
-{
- hash_secret_salt = hash_salt;
- return 1;
-}
-
int
xmlrpc_XML_Parse(XML_Parser const xmlParserP,
const char * const s,
diff --git a/advanced/lib/expat/xmlparse/xmlparse.h b/advanced/lib/expat/xmlparse/xmlparse.h
index 1111111..2222222 100644
--- a/advanced/lib/expat/xmlparse/xmlparse.h
+++ b/advanced/lib/expat/xmlparse/xmlparse.h
@@ -491,8 +491,6 @@ xmlrpc_XML_SetParamEntityParsing(XML_Parser parser,
function behavior. This must be called before parsing is started.
Returns 1 if successful, 0 when called after parsing has started.
*/
-int
-XML_SetHashSalt(XML_Parser parser, unsigned long hash_salt);
enum XML_Error {
XML_ERROR_NONE,
diff --git a/advanced/src/cpp/packetsocket.cpp b/advanced/src/cpp/packetsocket.cpp
index 1111111..2222222 100644
--- a/advanced/src/cpp/packetsocket.cpp
+++ b/advanced/src/cpp/packetsocket.cpp
@@ -45,7 +45,7 @@
example, an unplugged TCP/IP network cable. It's probably better
to use the TCP keepalive facility for that.
============================================================================*/
-#include "xmlrpc_config.h"
+#define MSVCRT 1
#include <cassert>
#include <string>
diff --git a/advanced/src/cpp/server_abyss.cpp b/advanced/src/cpp/server_abyss.cpp
index 1111111..2222222 100644
--- a/advanced/src/cpp/server_abyss.cpp
+++ b/advanced/src/cpp/server_abyss.cpp
@@ -1,4 +1,4 @@
-#include "xmlrpc_config.h"
+#define MSVCRT 1
#define WIN32_LEAN_AND_MEAN /* required by xmlrpc-c/abyss.h */
#include <cstdlib>
#include <string>
diff --git a/advanced/src/cpp/server_cgi.cpp b/advanced/src/cpp/server_cgi.cpp
index 1111111..2222222 100644
--- a/advanced/src/cpp/server_cgi.cpp
+++ b/advanced/src/cpp/server_cgi.cpp
@@ -12,7 +12,7 @@
Contributed to the public domain by its author.
=============================================================================*/
-#include "xmlrpc_config.h"
+#define MSVCRT 1
#if MSVCRT
#ifndef _CRT_SECURE_NO_WARNINGS
#define _CRT_SECURE_NO_WARNINGS
diff --git a/advanced/src/cpp/server_pstream.cpp b/advanced/src/cpp/server_pstream.cpp
index 1111111..2222222 100644
--- a/advanced/src/cpp/server_pstream.cpp
+++ b/advanced/src/cpp/server_pstream.cpp
@@ -14,7 +14,7 @@
Contributed to the public domain by its author.
=============================================================================*/
-#include "xmlrpc_config.h"
+#define MSVCRT 1
#if MSVCRT
#ifndef _CRT_SECURE_NO_WARNINGS
#define _CRT_SECURE_NO_WARNINGS
diff --git a/advanced/src/xmlrpc_datetime.c b/advanced/src/xmlrpc_datetime.c
index 1111111..2222222 100644
--- a/advanced/src/xmlrpc_datetime.c
+++ b/advanced/src/xmlrpc_datetime.c
@@ -1,7 +1,5 @@
#include "xmlrpc_config.h"
-#define _XOPEN_SOURCE 600 /* Make sure strdup() is in <string.h> */
-
#include <time.h>
#include <stdlib.h>
#include <string.h>