From ce484b9aaff7331a36da08b6d9b42740d232c72d Mon Sep 17 00:00:00 2001
From: Marcus Brinkmann <mb@g10code.com>
Date: Mon, 1 Nov 2010 16:23:33 +0000
Subject: 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.
---
 src/assuan-socket.c | 4 ++++
 1 file changed, 4 insertions(+)

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

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"
-- 
cgit v1.2.3