From ccbb4c3652ee72386b8889358b829e256e1ebcda Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Thu, 19 Jan 2012 22:27:44 +0100 Subject: Port Windows code to NPTH. * agent/gpg-agent.c (get_agent_ssh_socket_name): Use INVALID_HANDLE_VALUE instead of 0. (handle_signal) [!HAVE_W32_SYSTEM]: Don't define. (handle_connections): Port Windows code to NPTH. * dirmngr/dirmngr.c (handle_connections): Port Windows code to NPTH. * g13/g13.c (handle_connections): Port Windows code to NPTH. * scd/scdaemon.c (handle_connections): Port Windows code to NPTH. --- dirmngr/dirmngr.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'dirmngr/dirmngr.c') diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c index 51cefd590..b0410afd0 100644 --- a/dirmngr/dirmngr.c +++ b/dirmngr/dirmngr.c @@ -1749,9 +1749,6 @@ handle_connections (assuan_fd_t listen_fd) npth_sigev_add (SIGINT); npth_sigev_add (SIGTERM); npth_sigev_fini (); -#else - /* Use a dummy event. */ - sigs = 0; #endif /* Setup the fdset. It has only one member. This is because we use @@ -1791,12 +1788,15 @@ handle_connections (assuan_fd_t listen_fd) } npth_timersub (&abstime, &curtime, &timeout); +#ifndef HAVE_W32_SYSTEM ret = npth_pselect (nfd+1, &read_fdset, NULL, NULL, &timeout, npth_sigev_sigmask()); saved_errno = errno; -#ifndef HAVE_W32_SYSTEM while (npth_sigev_get_pending(&signo)) handle_signal (signo); +#else + ret = npth_eselect (nfd+1, &read_fdset, NULL, NULL, &timeout, NULL, NULL); + saved_errno = errno; #endif if (ret == -1 && saved_errno != EINTR) -- cgit v1.2.3