[svn] gpgme - r1233 - trunk/assuan

[svn author wk]

Author: wk
Date: 2007-07-12 20:54:45 +0200 (Thu, 12 Jul 2007)
New Revision: 1233

Modified:
   trunk/assuan/ChangeLog
   trunk/assuan/assuan-handler.c
   trunk/assuan/assuan-socket.c
Log:
Minor fixes for W32


Modified: trunk/assuan/ChangeLog
===================================================================
--- trunk/assuan/ChangeLog	2007-07-12 18:31:22 UTC (rev 1232)
+++ trunk/assuan/ChangeLog	2007-07-12 18:54:45 UTC (rev 1233)
@@ -1,5 +1,9 @@
 2007-07-12  Werner Koch  <wk at 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.
 

Modified: trunk/assuan/assuan-handler.c
===================================================================
--- trunk/assuan/assuan-handler.c	2007-07-12 18:31:22 UTC (rev 1232)
+++ trunk/assuan/assuan-handler.c	2007-07-12 18:54:45 UTC (rev 1233)
@@ -663,7 +663,11 @@
       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;

Modified: trunk/assuan/assuan-socket.c
===================================================================
--- trunk/assuan/assuan-socket.c	2007-07-12 18:31:22 UTC (rev 1232)
+++ trunk/assuan/assuan-socket.c	2007-07-12 18:54:45 UTC (rev 1233)
@@ -50,7 +50,7 @@
 #else
   int rc = closesocket (fd);
   if (rc && WSAGetLastError () == WSAENOTSOCK)
-      rc = close (fd);
+    rc = CloseHandle (fd);
   return rc;
 #endif
 }