ext: Include winsock.h on Windows when required

https://bugzilla.gnome.org/show_bug.cgi?id=733052

diff --git a/ext/curl/gstcurlsftpsink.c b/ext/curl/gstcurlsftpsink.c
index 961ad438a596bdc68ef056d6cd87bc9c538c01b6..17f5cbcdee0cd8a5854b16795b51e140bee511c2 100644 (file)
--- a/ext/curl/gstcurlsftpsink.c
+++ b/ext/curl/gstcurlsftpsink.c
@@ -48,12 +48,16 @@
 #include <string.h>
 #include <stdio.h>
 
+#ifdef _WIN32
+#include <winsock.h>
+#else
 #include <sys/socket.h>
-#include <sys/types.h>
 #include <netinet/in.h>
-#include <unistd.h>
 #include <netinet/ip.h>
 #include <netinet/tcp.h>
+#endif
+#include <sys/types.h>
+#include <unistd.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 

diff --git a/ext/curl/gstcurlsshsink.c b/ext/curl/gstcurlsshsink.c
index b4c6b7793929e56237fd13adc3361b8a425ac542..d5506b9944db86c1f4b51891176f2a62db64e16d 100644 (file)
--- a/ext/curl/gstcurlsshsink.c
+++ b/ext/curl/gstcurlsshsink.c
@@ -34,12 +34,16 @@
 #include <string.h>
 #include <stdio.h>
 
+#ifdef _WIN32
+#include <winsock.h>
+#else
 #include <sys/socket.h>
-#include <sys/types.h>
 #include <netinet/in.h>
-#include <unistd.h>
 #include <netinet/ip.h>
 #include <netinet/tcp.h>
+#endif
+#include <sys/types.h>
+#include <unistd.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 

diff --git a/ext/opencv/MotionCells.cpp b/ext/opencv/MotionCells.cpp
index 749c96e2147e84d407213571105159f1bdfc8c4c..1d88e10745ce10ddcd2819a837612516f7517be0 100644 (file)
--- a/ext/opencv/MotionCells.cpp
+++ b/ext/opencv/MotionCells.cpp
@@ -53,7 +53,12 @@
 #include <errno.h>
 #include <math.h>
 #include <gst/gst.h>
-#include <arpa/inet.h>
+#ifdef _WIN32
+  #include <winsock.h>
+  #define bzero(p, l) memset(p, 0, l)
+#else
+  #include <arpa/inet.h>
+#endif
 #include "MotionCells.h"
 
 uint64_t ntohl64 (uint64_t val);