From 6c61bc48f1a3eef71bb8c602501a2737ba5fd153 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Tue, 12 Jun 2007 13:39:37 +0000
Subject: Various minor changes for W32

---
 src/assuan-socket-server.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'src/assuan-socket-server.c')

diff --git a/src/assuan-socket-server.c b/src/assuan-socket-server.c
index 45c227d..5c46164 100644
--- a/src/assuan-socket-server.c
+++ b/src/assuan-socket-server.c
@@ -25,13 +25,19 @@
 #include <errno.h>
 #include <unistd.h>
 #include <sys/types.h>
-#ifndef HAVE_W32_SYSTEM
-#include <sys/socket.h>
-#include <sys/un.h>
+#ifdef HAVE_W32_SYSTEM
+# include <windows.h>
+# if HAVE_SYS_SOCKET_H
+#  include <sys/socket.h>
+# elif HAVE_WS2TCPIP_H
+#  include <ws2tcpip.h>
+# endif
 #else
-#include <windows.h>
+# include <sys/socket.h>
+# include <sys/un.h>
 #endif
 
+
 #include "assuan-defs.h"
 
 static struct assuan_io io = { _assuan_simple_read,
-- 
cgit v1.2.3