[SCM] GNU gnutls branch, master, updated. gnutls_3_0_4-46-g4826354

[Nikos Mavrogiannopoulos]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=482635401b91171259c9a027d0bc2faefb7e8c68

The branch, master has been updated
       via  482635401b91171259c9a027d0bc2faefb7e8c68 (commit)
      from  16a068802c6540f2f04b4d893a33fd82695a8f9c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 482635401b91171259c9a027d0bc2faefb7e8c68
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu Oct 27 09:19:58 2011 +0200

    do not unconditionally include sys/socket.h.

-----------------------------------------------------------------------

Summary of changes:
 lib/gnutls_int.h      |    6 +++++-
 lib/opencdk/opencdk.h |    3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/gnutls_int.h b/lib/gnutls_int.h
index f36b285..4818eeb 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 0b1ec6c..113e64e 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>


hooks/post-receive
-- 
GNU gnutls