Added patch to always define hton/ntoh macros in winsock.h.

patches/include-winsock/0001-include-Always-define-hton-ntoh-macros.patch

@@ -0,0 +1,34 @@
+From a3867ccbd2fc783982263556d4b9ca525e1ef389 Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Thu, 28 Sep 2017 07:02:55 +0200
+Subject: include: Always define hton/ntoh macros.
+
+---
+ include/winsock.h | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/include/winsock.h b/include/winsock.h
+index 8b8db83c15b..86ce4ffcf05 100644
+--- a/include/winsock.h
++++ b/include/winsock.h
+@@ -510,8 +510,6 @@ int WINAPI __WSAFDIsSet(SOCKET,WS(fd_set)*);
+ #endif /* WS_DEFINE_SELECT */
+ 
+ /* we have to define hton/ntoh as macros to avoid conflicts with Unix headers */
+-#ifndef USE_WS_PREFIX
+-
+ #undef htonl
+ #undef htons
+ #undef ntohl
+@@ -549,8 +547,6 @@ static inline ULONG __wine_ulong_swap(ULONG l)
+ 
+ #endif  /* WORDS_BIGENDIAN */
+ 
+-#endif  /* USE_WS_PREFIX */
+-
+ /*
+  * Internet address (old style... should be updated)
+  */
+-- 
+2.14.1
+

patches/patchinstall.sh

@@ -52,7 +52,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "c91a531957acaf4cf7cdb985b5ba47a273f5f9b2"
+	echo "40166848a7944383a4cfdaac9b18bd03fbb2b4f9"
 }
 
 # Show version information
@@ -184,6 +184,7 @@ patch_enable_all ()
 	enable_imagehlp_Cleanup="$1"
 	enable_imagehlp_ImageLoad="$1"
 	enable_imm32_IMMDisableLegacyIME="$1"
+	enable_include_winsock="$1"
 	enable_inseng_Implementation="$1"
 	enable_iphlpapi_System_Ping="$1"
 	enable_iphlpapi_TCP_Table="$1"
@@ -830,6 +831,9 @@ patch_enable ()
 		imm32-IMMDisableLegacyIME)
 			enable_imm32_IMMDisableLegacyIME="$2"
 			;;
+		include-winsock)
+			enable_include_winsock="$2"
+			;;
 		inseng-Implementation)
 			enable_inseng_Implementation="$2"
 			;;
@@ -5102,6 +5106,18 @@ if test "$enable_imm32_IMMDisableLegacyIME" -eq 1; then
 	) >> "$patchlist"
 fi
 
+# Patchset include-winsock
+# |
+# | Modified files:
+# |   *	include/winsock.h
+# |
+if test "$enable_include_winsock" -eq 1; then
+	patch_apply include-winsock/0001-include-Always-define-hton-ntoh-macros.patch
+	(
+		printf '%s\n' '+    { "Sebastian Lackner", "include: Always define hton/ntoh macros.", 1 },';
+	) >> "$patchlist"
+fi
+
 # Patchset inseng-Implementation
 # |
 # | This patchset fixes the following Wine bugs: