[vlc-commits] contrib: shout: socklen_t can be found in ws2tcpip.h on Windows

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Thu Mar 29 15:13:55 2018 +0200| [be5340296c2246bd8bbf4cf2d40cf8d3c42043db] | committer: Steve Lhomme

contrib: shout: socklen_t can be found in ws2tcpip.h on Windows

and make sure it's found on Windows Store builds as well

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=be5340296c2246bd8bbf4cf2d40cf8d3c42043db
---

 contrib/src/shout/rules.mak                 |  1 +
 contrib/src/shout/shout-win32-socklen.patch | 12 ++++++++++++
 2 files changed, 13 insertions(+)

diff --git a/contrib/src/shout/rules.mak b/contrib/src/shout/rules.mak
index 6940cc0a79..ae585f6238 100644
--- a/contrib/src/shout/rules.mak
+++ b/contrib/src/shout/rules.mak
@@ -25,6 +25,7 @@ libshout: libshout-$(SHOUT_VERSION).tar.gz .sum-shout
 	$(APPLY) $(SRC)/shout/fix-xiph_openssl.patch
 	$(APPLY) $(SRC)/shout/shout-strings.patch
 	$(APPLY) $(SRC)/shout/shout-timeval.patch
+	$(APPLY) $(SRC)/shout/shout-win32-socklen.patch
 	$(call pkg_static,"shout.pc.in")
 	$(UPDATE_AUTOCONFIG)
 	$(MOVE)
diff --git a/contrib/src/shout/shout-win32-socklen.patch b/contrib/src/shout/shout-win32-socklen.patch
new file mode 100644
index 0000000000..57821bff90
--- /dev/null
+++ b/contrib/src/shout/shout-win32-socklen.patch
@@ -0,0 +1,12 @@
+--- libshout/src/common/net/sock.c.socklen	2018-03-29 15:11:28.885555300 +0200
++++ libshout/src/common/net/sock.c	2018-03-29 11:13:03.178552900 +0200
+@@ -57,6 +57,9 @@
+ #include <netdb.h>
+ #else
+ #include <winsock2.h>
++#undef WINAPI_FAMILY
++#define WINAPI_FAMILY WINAPI_FAMILY_DESKTOP_APP
++#include <ws2tcpip.h>
+ #endif
+ 
+ #include "sock.h"