From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Thu, 27 Oct 2011 07:19:58 +0000 (+0200)
Subject: do not unconditionally include sys/socket.h.
X-Git-Tag: gnutls_3_0_5~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=482635401b91171259c9a027d0bc2faefb7e8c68;p=thirdparty%2Fgnutls.git

do not unconditionally include sys/socket.h.
---

diff --git a/lib/gnutls_int.h b/lib/gnutls_int.h
index f36b28513a..4818eebaeb 100644
--- a/lib/gnutls_int.h
+++ b/lib/gnutls_int.h
@@ -43,7 +43,11 @@ typedef int ssize_t;
 #include <sys/types.h>
 #include <unistd.h>
 #include <sys/stat.h>
-#include <sys/socket.h>
+#if HAVE_SYS_SOCKET_H
+# include <sys/socket.h>
+#elif HAVE_WS2TCPIP_H
+# include <ws2tcpip.h>
+#endif
 #include <time.h>
 #include <u64.h> /* gnulib for uint64_t */
 
diff --git a/lib/opencdk/opencdk.h b/lib/opencdk/opencdk.h
index 0b1ec6c7ee..113e64e88e 100644
--- a/lib/opencdk/opencdk.h
+++ b/lib/opencdk/opencdk.h
@@ -24,9 +24,10 @@
 #ifndef OPENCDK_H
 #define OPENCDK_H
 
+#include <config.h>
+#include <gnutls_int.h>
 #include <stddef.h>             /* for size_t */
 #include <stdarg.h>
-#include <gnutls_int.h>
 #include <gnutls_mem.h>
 #include <gnutls/gnutls.h>
 #include <gnutls_errors.h>