Minor fixes for W32

diff --git a/trunk/assuan/ChangeLog b/trunk/assuan/ChangeLog
index 9bad1ee2969925e6e36f05e3eecdd83e056ab051..ada72ffdafa7ae9a94d96784beccf8e8a3357559 100644 (file)
--- a/trunk/assuan/ChangeLog
+++ b/trunk/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/trunk/assuan/assuan-handler.c b/trunk/assuan/assuan-handler.c
index 45a901c702e4c9ee01c22e186fa5161e4ef2dc9d..d1b29cffea096b55d791b1855ad4d57071664f16 100644 (file)
--- a/trunk/assuan/assuan-handler.c
+++ b/trunk/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/trunk/assuan/assuan-socket.c b/trunk/assuan/assuan-socket.c
index 6aa570896fb72071f224935320b72e0f9583f771..196c4f6f63233601b6c25ecd38fd01d249b43953 100644 (file)
--- a/trunk/assuan/assuan-socket.c
+++ b/trunk/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
 }