diff options
author | Ivan Zhakov <ivan@apache.org> | 2022-01-20 12:40:37 +0000 |
---|---|---|
committer | Ivan Zhakov <ivan@apache.org> | 2022-01-20 12:40:37 +0000 |
commit | a484479e9e36e50fd870eb223c5043fa90211ea4 (patch) | |
tree | 1a7eddfa889135959b68f6077a44cdee3bd07abd /poll | |
parent | 9ab53c7804e74e3302efafd35182e1f670967d7f (diff) | |
download | apr-a484479e9e36e50fd870eb223c5043fa90211ea4.tar.gz |
On 'win32-pollset-wakeup-no-file-socket-emulation' branch:
Windows: Use term `socket_pipe` instead for `file_socket_pipe` for internal
poll wakeup socket API. Move implementation to network_io/win32/socket_pipe.c
from file_io/win32/pipe.c.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/win32-pollset-wakeup-no-file-socket-emulation@1897246 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'poll')
-rw-r--r-- | poll/unix/wakeup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/poll/unix/wakeup.c b/poll/unix/wakeup.c index e2deea172..bb0356444 100644 --- a/poll/unix/wakeup.c +++ b/poll/unix/wakeup.c @@ -33,7 +33,7 @@ apr_status_t apr_poll_create_wakeup_socket(apr_pool_t *pool, apr_pollfd_t *pfd, { apr_status_t rv; - if ((rv = apr_file_socket_pipe_create(&wakeup_socket[0], &wakeup_socket[1], + if ((rv = apr_socket_pipe_create(&wakeup_socket[0], &wakeup_socket[1], pool)) != APR_SUCCESS) return rv; @@ -50,11 +50,11 @@ apr_status_t apr_poll_close_wakeup_socket(apr_socket_t **wakeup_socket) /* Close both sides of the wakeup pipe */ if (wakeup_socket[0]) { - rv0 = apr_file_socket_pipe_close(wakeup_socket[0]); + rv0 = apr_socket_pipe_close(wakeup_socket[0]); wakeup_socket[0] = NULL; } if (wakeup_socket[1]) { - rv1 = apr_file_socket_pipe_close(wakeup_socket[1]); + rv1 = apr_socket_pipe_close(wakeup_socket[1]); wakeup_socket[1] = NULL; } return rv0 ? rv0 : rv1; |