diff options
author | Marcus Brinkmann <mb@g10code.com> | 2010-11-01 16:23:33 +0000 |
---|---|---|
committer | Marcus Brinkmann <mb@g10code.com> | 2010-11-01 16:23:33 +0000 |
commit | ce484b9aaff7331a36da08b6d9b42740d232c72d (patch) | |
tree | 1b4e2c953fcec9c79143715765a3b02b76207707 /src/assuan-socket.c | |
parent | d1a697a3264b6f482449be1e23a99dcc57451864 (diff) | |
download | libassuan-ce484b9aaff7331a36da08b6d9b42740d232c72d.tar.gz |
2010-11-01 Marcus Brinkmann <marcus.brinkmann@ruhr-uni-bochum.de>
* configure.ac: Check for fcntl.h.
2010-11-01 Marcus Brinkmann <marcus.brinkmann@ruhr-uni-bochum.de>
* assuan-socket.c, assuan-uds.c, system.c, assuan-pipe-server.c,
assuan-pipe-connect.c [!HAVE_FCNTL_H]: Don't include fcntl.h.
* assuan-buffer.c [!HAVE_W32CE_SYSTEM]: Do not include process.h.
* assuan-socket.c [!HAVE_W32CE_SYSTEM]: Do not include io.h.
* w32-includes.inc.h: Include winsock2.h before ws2tcpip.h.
* sysutils.c (w32_read_registry): Replace goto label "leave" by
"out" (as leave is defined by some Windows header file).
* assuan-inquire.c: Likewise.
Diffstat (limited to 'src/assuan-socket.c')
-rw-r--r-- | src/assuan-socket.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/assuan-socket.c b/src/assuan-socket.c index 937ff56..3814554 100644 --- a/src/assuan-socket.c +++ b/src/assuan-socket.c @@ -27,7 +27,9 @@ # define WIN32_LEAN_AND_MEAN # include <windows.h> # include <wincrypt.h> +#ifndef HAVE_W32CE_SYSTEM # include <io.h> +#endif #else # include <sys/types.h> # include <sys/socket.h> @@ -36,7 +38,9 @@ #ifdef HAVE_SYS_STAT_H # include <sys/stat.h> #endif +#ifdef HAVE_FCNTL_H #include <fcntl.h> +#endif #include <assert.h> #include "assuan-defs.h" |