fix building gnutls-wrapper on Windows

lm · Mar 22, 2011 · 3fa7ea9 · 3fa7ea9
1 parent e04c57c
commit 3fa7ea9
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 2 deletions.
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
@@ -1,3 +1,7 @@
+2011-03-22  Paolo Bonzini  <bonzini@gnu.org>
+
+	* lib-src/socketx.h: Define shutdown arguments for the sake of Windows.
+
 2011-03-12  Paolo Bonzini  <bonzini@gnu.org>
 
 	* lib-src/ltdl.c: clang analyzer fixes.

diff --git a/lib-src/socketx.h b/lib-src/socketx.h
@@ -135,6 +135,12 @@ typedef int SOCKET;
 #endif
 #endif
 
+#ifndef SHUT_RDWR
+#define SHUT_RD		0
+#define SHUT_WR		1
+#define SHUT_RDWR	2
+#endif
+
 #endif /* !__MSVCRT__ */
 
 #include "getaddrinfo.h"

diff --git a/packages/net/ChangeLog b/packages/net/ChangeLog
@@ -1,3 +1,7 @@
+2011-03-22  Paolo Bonzini  <bonzini@gnu.org>
+
+	* gnutls-wrapper.c: Fixes for Win32 compilation.
+
 2011-03-21  Paolo Bonzini  <bonzini@gnu.org>
 
 	* URIResolver.st: Reorder exceptions.

diff --git a/packages/net/Makefile.am b/packages/net/Makefile.am
@@ -1,6 +1,7 @@
 pkglibexecdir = $(libexecdir)/$(PACKAGE)
 pkglibexec_PROGRAMS = gnutls-wrapper
 gnutls_wrapper_SOURCES = gnutls-wrapper.c
-gnutls_wrapper_LDADD = @GNUTLS_LIBS@ $(top_builddir)/lib-src/library.la
+gnutls_wrapper_LDADD = $(GNUTLS_LIBS) $(SOCKET_LIBS) \
+	$(top_builddir)/lib-src/library.la
 
-AM_CPPFLAGS = @GNUTLS_CFLAGS@ -I$(top_srcdir)/lib-src
+AM_CPPFLAGS = $(GNUTLS_CFLAGS) -I$(top_srcdir)/lib-src