From: Werner Koch <wk@gnupg.org>
Date: Thu, 12 Jul 2007 18:54:45 +0000 (+0000)
Subject: Minor fixes for W32
X-Git-Tag: gpgme-1.1.6~52
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=409aaefe365e8eb9a8c89fccf64e27fe32b73de7;p=gpgme.git

Minor fixes for W32
---

diff --git a/assuan/ChangeLog b/assuan/ChangeLog
index 9bad1ee..ada72ff 100644
--- a/assuan/ChangeLog
+++ b/assuan/ChangeLog
@@ -1,5 +1,9 @@
 2007-07-12  Werner Koch  <wk@g10code.com>
 
+	* assuan-handler.c (assuan_get_active_fds): Use get_osfhandle for
+	the data fp.
+	* assuan-socket.c (_assuan_close) [W32]: Use CloseHandle and not close.
+
 	* assuan-io.c (_assuan_simple_write, _assuan_simple_read): Map
 	ERROR_BROKEN_PIPE to EPIPE.
 
diff --git a/assuan/assuan-handler.c b/assuan/assuan-handler.c
index 45a901c..d1b29cf 100644
--- a/assuan/assuan-handler.c
+++ b/assuan/assuan-handler.c
@@ -663,7 +663,11 @@ assuan_get_active_fds (assuan_context_t ctx, int what,
       if (ctx->outbound.fd != -1)
         fdarray[n++] = ctx->outbound.fd;
       if (ctx->outbound.data.fp)
+#ifdef HAVE_W32_SYSTEM
+        fdarray[n++] = _get_osfhandle (fileno (ctx->outbound.data.fp));
+#else
         fdarray[n++] = fileno (ctx->outbound.data.fp);
+#endif
     }
 
   return n;
diff --git a/assuan/assuan-socket.c b/assuan/assuan-socket.c
index 6aa5708..196c4f6 100644
--- a/assuan/assuan-socket.c
+++ b/assuan/assuan-socket.c
@@ -50,7 +50,7 @@ _assuan_close (int fd)
 #else
   int rc = closesocket (fd);
   if (rc && WSAGetLastError () == WSAENOTSOCK)
-      rc = close (fd);
+    rc = CloseHandle (fd);
   return rc;
 #endif
 }