From 571ab663fdd14887cd37eaf030aa6c7e3a1bfc13 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sat, 25 Jun 2016 07:13:04 +0200
Subject: [PATCH] Added patch to remove duplicate definition in
 include/webservices.h.

---
 ...uplicate-definition-of-WS_XML_NODE_P.patch | 24 +++++++++++++++++++
 patches/patchinstall.sh                       | 16 +++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 patches/include-webservices/0001-include-Remove-duplicate-definition-of-WS_XML_NODE_P.patch

diff --git a/patches/include-webservices/0001-include-Remove-duplicate-definition-of-WS_XML_NODE_P.patch b/patches/include-webservices/0001-include-Remove-duplicate-definition-of-WS_XML_NODE_P.patch
new file mode 100644
index 00000000..1c8ff78a
--- /dev/null
+++ b/patches/include-webservices/0001-include-Remove-duplicate-definition-of-WS_XML_NODE_P.patch
@@ -0,0 +1,24 @@
+From 50389a00b3f63757d8cab2b36e63d88f955d5a92 Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Sat, 25 Jun 2016 07:11:52 +0200
+Subject: include: Remove duplicate definition of WS_XML_NODE_POSITION.
+
+---
+ include/webservices.h | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/include/webservices.h b/include/webservices.h
+index a5ffd51..3c808f5 100644
+--- a/include/webservices.h
++++ b/include/webservices.h
+@@ -73,7 +73,6 @@ typedef struct _WS_CUSTOM_HTTP_PROXY WS_CUSTOM_HTTP_PROXY;
+ typedef struct _WS_HTTP_MESSAGE_MAPPING WS_HTTP_MESSAGE_MAPPING;
+ typedef struct _WS_HTTP_HEADER_MAPPING WS_HTTP_HEADER_MAPPING;
+ typedef struct _WS_HTTP_REDIRECT_CALLBACK_CONTEXT WS_HTTP_REDIRECT_CALLBACK_CONTEXT;
+-typedef struct _WS_XML_NODE_POSITION WS_XML_NODE_POSITION;
+ 
+ struct _WS_STRUCT_DESCRIPTION;
+ struct _WS_XML_STRING;
+-- 
+2.8.0
+
diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index 09b79878..a84bf966 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -159,6 +159,7 @@ patch_enable_all ()
 	enable_imagehlp_Cleanup="$1"
 	enable_imagehlp_ImageLoad="$1"
 	enable_imm32_IMMDisableLegacyIME="$1"
+	enable_include_webservices="$1"
 	enable_iphlpapi_System_Ping="$1"
 	enable_iphlpapi_TCP_Table="$1"
 	enable_kernel32_COMSPEC="$1"
@@ -655,6 +656,9 @@ patch_enable ()
 		imm32-IMMDisableLegacyIME)
 			enable_imm32_IMMDisableLegacyIME="$2"
 			;;
+		include-webservices)
+			enable_include_webservices="$2"
+			;;
 		iphlpapi-System_Ping)
 			enable_iphlpapi_System_Ping="$2"
 			;;
@@ -3902,6 +3906,18 @@ if test "$enable_imm32_IMMDisableLegacyIME" -eq 1; then
 	) >> "$patchlist"
 fi
 
+# Patchset include-webservices
+# |
+# | Modified files:
+# |   *	include/webservices.h
+# |
+if test "$enable_include_webservices" -eq 1; then
+	patch_apply include-webservices/0001-include-Remove-duplicate-definition-of-WS_XML_NODE_P.patch
+	(
+		echo '+    { "Sebastian Lackner", "include: Remove duplicate definition of WS_XML_NODE_POSITION.", 1 },';
+	) >> "$patchlist"
+fi
+
 # Patchset iphlpapi-System_Ping
 # |
 # | This patchset fixes the following Wine bugs: