aboutsummaryrefslogtreecommitdiffstats
path: root/src/assuan-socket-server.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2007-06-12 13:39:37 +0000
committerWerner Koch <[email protected]>2007-06-12 13:39:37 +0000
commit6c61bc48f1a3eef71bb8c602501a2737ba5fd153 (patch)
tree771ea4ee0c757f62d5d7767d6bfcfae08379dcd7 /src/assuan-socket-server.c
parent2007-05-06 Marcus Brinkmann <[email protected]> (diff)
downloadlibassuan-6c61bc48f1a3eef71bb8c602501a2737ba5fd153.tar.gz
libassuan-6c61bc48f1a3eef71bb8c602501a2737ba5fd153.zip
Various minor changes for W32
Diffstat (limited to 'src/assuan-socket-server.c')
-rw-r--r--src/assuan-socket-server.c14
1 files changed, 10 insertions, 4 deletions
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,