diff options
| author | NIIBE Yutaka <[email protected]> | 2021-11-25 02:13:17 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2021-11-25 02:13:17 +0000 |
| commit | 8148237cb4ae20755c06a44d71761c7030973c3d (patch) | |
| tree | aaa3d581d5094f436a6ec353f390b25f902d206d /src/ath.c | |
| parent | gpgme.pc: Fix library dependency and use of includedir, libdir. (diff) | |
| download | gpgme-8148237cb4ae20755c06a44d71761c7030973c3d.tar.gz gpgme-8148237cb4ae20755c06a44d71761c7030973c3d.zip | |
posix: Use poll instead, when available, removing use of select.
* configure.ac (HAVE_POLL_H): Add the check.
* src/ath.c [!HAVE_POLL_H] (ath_select): Enable conditionally.
* src/posix-io.c [HAVE_POLL_H] (_gpgme_io_select_poll): Use poll.
* tests/gpg/t-cancel.c [HAVE_POLL_H] (do_select): Use poll.
* tests/gpg/t-eventloop.c [HAVE_POLL_H] (do_select): Use poll.
--
GnuPG-bug-id: 2385
Signed-off-by: NIIBE Yutaka <[email protected]>
Diffstat (limited to 'src/ath.c')
| -rw-r--r-- | src/ath.c | 15 |
1 files changed, 10 insertions, 5 deletions
@@ -26,11 +26,15 @@ #ifdef HAVE_UNISTD_H # include <unistd.h> #endif -#ifdef HAVE_SYS_SELECT_H -# include <sys/select.h> +#ifdef HAVE_POLL_H +# include <poll.h> #else -# ifdef HAVE_SYS_TIME_H -# include <sys/time.h> +# ifdef HAVE_SYS_SELECT_H +# include <sys/select.h> +# else +# ifdef HAVE_SYS_TIME_H +# include <sys/time.h> +# endif # endif #endif #ifdef HAVE_SYS_TYPES_H @@ -89,6 +93,7 @@ ath_write (int fd, const void *buf, size_t nbytes) } +#if !defined(HAVE_POLL_H) gpgme_ssize_t ath_select (int nfd, fd_set *rset, fd_set *wset, fd_set *eset, struct timeval *timeout) @@ -99,7 +104,7 @@ ath_select (int nfd, fd_set *rset, fd_set *wset, fd_set *eset, return select (nfd, rset, wset, eset, timeout); #endif } - +#endif gpgme_ssize_t ath_waitpid (pid_t pid, int *status, int options) |