do not unconditionally include sys/socket.h.

diff --git a/lib/gnutls_int.h b/lib/gnutls_int.h
index f36b28513a818dda74ca9f30712be2e050e80559..4818eebaebe5795f270f49f5e3426fe026692aa2 100644 (file)
--- 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 0b1ec6c7ee753d31a11268706801d39b5afa9e9b..113e64e88e2dd8384fdb7b29272bb6da16497ae8 100644 (file)
--- 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>