diff options
| author | Marcus Brinkmann <[email protected]> | 2007-07-04 20:03:39 +0000 | 
|---|---|---|
| committer | Marcus Brinkmann <[email protected]> | 2007-07-04 20:03:39 +0000 | 
| commit | a63c5c013771799432dadec5e2f0aabd48db6af4 (patch) | |
| tree | fad748a885a93d27c78fa043a87a4ad3753baee3 /assuan/assuan-socket-server.c | |
| parent | 2007-07-04 Marcus Brinkmann <[email protected]> (diff) | |
| download | gpgme-a63c5c013771799432dadec5e2f0aabd48db6af4.tar.gz gpgme-a63c5c013771799432dadec5e2f0aabd48db6af4.zip | |
2007-07-04  Marcus Brinkmann  <[email protected]>
	* assuan/: Update files to 2007-07-04 version of assuan.
Diffstat (limited to 'assuan/assuan-socket-server.c')
| -rw-r--r-- | assuan/assuan-socket-server.c | 14 | 
1 files changed, 10 insertions, 4 deletions
| diff --git a/assuan/assuan-socket-server.c b/assuan/assuan-socket-server.c index 45c227d6..5c461644 100644 --- a/assuan/assuan-socket-server.c +++ b/assuan/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, | 
