[vlc-commits] contrib: shout: timeval is defined in winsock2.h on Windows

[Steve Lhomme]

vlc/vlc-3.0 | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Thu Mar 29 15:06:53 2018 +0200| [69deee1e46f3353cb93a4f5f91fa374260d81226] | committer: Steve Lhomme

contrib: shout: timeval is defined in winsock2.h on Windows

(cherry picked from commit 651e85409d9dc44c35e8a13552fc17675f4c9bf5) (rebased)

rebased:
- some shout patches were backported before

Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>

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

 contrib/src/shout/rules.mak           |  1 +
 contrib/src/shout/shout-timeval.patch | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/contrib/src/shout/rules.mak b/contrib/src/shout/rules.mak
index 5e487ec124..1b246054e5 100644
--- a/contrib/src/shout/rules.mak
+++ b/contrib/src/shout/rules.mak
@@ -24,6 +24,7 @@ libshout: libshout-$(SHOUT_VERSION).tar.gz .sum-shout
 	$(APPLY) $(SRC)/shout/libshout-arpa.patch
 	$(APPLY) $(SRC)/shout/fix-xiph_openssl.patch
 	$(APPLY) $(SRC)/shout/shout-strings.patch
+	$(APPLY) $(SRC)/shout/shout-timeval.patch
 	$(APPLY) $(SRC)/shout/no-examples.patch
 	$(APPLY) $(SRC)/shout/no-force-libwsock.patch
 	$(call pkg_static,"shout.pc.in")
diff --git a/contrib/src/shout/shout-timeval.patch b/contrib/src/shout/shout-timeval.patch
new file mode 100644
index 0000000000..6d05058446
--- /dev/null
+++ b/contrib/src/shout/shout-timeval.patch
@@ -0,0 +1,10 @@
+--- libshout/src/common/timing/timing.c.timeval	2015-01-27 19:08:54.000000000 +0100
++++ libshout/src/common/timing/timing.c	2018-03-29 10:33:11.505409500 +0200
+@@ -35,6 +35,7 @@
+ #ifdef _WIN32
+ #include <windows.h>
+ #include <mmsystem.h>
++#include <winsock2.h>
+ #else
+ #ifdef TIME_WITH_SYS_TIME
+ #  include <sys/time.h>