From cb0dcc340836a64e2d33b27f1be7bc888c084f12 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Fri, 7 Mar 2014 09:46:44 +0100
Subject: w32: Include winsock2.h to silence warnings.

---
 agent/preset-passphrase.c | 5 ++++-
 agent/protect.c           | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'agent')

diff --git a/agent/preset-passphrase.c b/agent/preset-passphrase.c
index e0cb77ea8..ad8e50047 100644
--- a/agent/preset-passphrase.c
+++ b/agent/preset-passphrase.c
@@ -38,7 +38,10 @@
 #include <fcntl.h> /* for setmode() */
 #endif
 #ifdef HAVE_W32_SYSTEM
-#include <windows.h>  /* To initialize the sockets.  fixme */
+# ifdef HAVE_WINSOCK2_H
+#  include <winsock2.h>
+# endif
+# include <windows.h>  /* To initialize the sockets.  fixme */
 #endif
 
 #define JNLIB_NEED_LOG_LOGV
diff --git a/agent/protect.c b/agent/protect.c
index 749867cc1..3a0021871 100644
--- a/agent/protect.c
+++ b/agent/protect.c
@@ -29,6 +29,9 @@
 #include <unistd.h>
 #include <sys/stat.h>
 #ifdef HAVE_W32_SYSTEM
+# ifdef HAVE_WINSOCK2_H
+#  include <winsock2.h>
+# endif
 # include <windows.h>
 #else
 # include <sys/times.h>
-- 
cgit v1.2.3