Make code compile with new gnulib.

diff --git a/lib/gnutls_buffers.c b/lib/gnutls_buffers.c
index 2058a2765f071db0844a9d5f5850205d6d10b424..f4d5911d76a3b827edc4aa0a66e16d7e2ac07cac 100644 (file)
--- a/lib/gnutls_buffers.c
+++ b/lib/gnutls_buffers.c
@@ -55,9 +55,10 @@
 
 #include <errno.h>
 
-#ifdef _WIN32
-# include <winsock2.h>
-#endif
+/* We need to disable gnulib's replacement wrappers to get native
+   Windows interfaces. */
+#undef recv
+#undef send
 
 #ifndef EAGAIN
 # define EAGAIN EWOULDBLOCK

diff --git a/libextra/gnutls_openssl.c b/libextra/gnutls_openssl.c
index 797a4f51da702836a1f5e1c0a75f1dfcf3f1bdd0..f64eef47d34d266807aa9a73fead1b2bf0006fc8 100644 (file)
--- a/libextra/gnutls_openssl.c
+++ b/libextra/gnutls_openssl.c
@@ -30,6 +30,10 @@
 #include "../lib/random.h"
 #include "../lib/gnutls_hash_int.h"
 
+/* Gnulib re-defines shutdown on mingw.  We only use it as a variable
+   name, so restore the original name. */
+#undef shutdown
+
 /* XXX: See lib/gnutls_int.h. */
 #define GNUTLS_POINTER_TO_INT(_) ((int) GNUTLS_POINTER_TO_INT_CAST (_))
 #define GNUTLS_INT_TO_POINTER(_) ((void*) GNUTLS_POINTER_TO_INT_CAST (_))