diff options
| -rw-r--r-- | assuan/ChangeLog | 4 | ||||
| -rw-r--r-- | assuan/assuan-handler.c | 4 | ||||
| -rw-r--r-- | assuan/assuan-socket.c | 2 |
3 files changed, 9 insertions, 1 deletions
diff --git a/assuan/ChangeLog b/assuan/ChangeLog index 9bad1ee2..ada72ffd 100644 --- a/assuan/ChangeLog +++ b/assuan/ChangeLog @@ -1,5 +1,9 @@ 2007-07-12 Werner Koch <[email protected]> + * 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 45a901c7..d1b29cff 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 6aa57089..196c4f6f 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 } |