diff options
| author | gsmith <gsmith@13f79535-47bb-0310-9956-ffa450edef68> | 2016-12-03 20:49:29 +0000 |
|---|---|---|
| committer | gsmith <gsmith@13f79535-47bb-0310-9956-ffa450edef68> | 2016-12-03 20:49:29 +0000 |
| commit | 37f1748dcdb4882a914f19c1ce32ad9b2b4824d1 (patch) | |
| tree | 873da673cea336723d4fff82d410511ea974c441 /poll | |
| parent | 28c784e40b260392fd52e34e29196a0e9f10985c (diff) | |
| download | libapr-37f1748dcdb4882a914f19c1ce32ad9b2b4824d1.tar.gz | |
Catch up legacy Windows builds
poll/unix/wakeup.c
fix typo
include/apr_cstr.h, strings/apr_cstr.c
Backport r1767019
apr.dsp, apr.mak, libapr.dsp, libapr.mak, makefile.win, test/makefile.win,
Add strings/apr_cstr.c
Remove Win9x targets
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1772487 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 f8ea06048..acf8afc97 100644 --- a/poll/unix/wakeup.c +++ b/poll/unix/wakeup.c @@ -32,7 +32,7 @@ apr_status_t apr_poll_create_wakeup_pipe(apr_pool_t *pool, apr_pollfd_t *pfd, { apr_status_t rv; - if ((rv = file_socket_pipe_create(&wakeup_pipe[0], &wakeup_pipe[1], + if ((rv = apr_file_socket_pipe_create(&wakeup_pipe[0], &wakeup_pipe[1], pool)) != APR_SUCCESS) return rv; @@ -49,11 +49,11 @@ apr_status_t apr_poll_close_wakeup_pipe(apr_file_t **wakeup_pipe) /* Close both sides of the wakeup pipe */ if (wakeup_pipe[0]) { - rv0 = file_socket_pipe_close(wakeup_pipe[0]); + rv0 = apr_file_socket_pipe_close(wakeup_pipe[0]); wakeup_pipe[0] = NULL; } if (wakeup_pipe[1]) { - rv1 = file_socket_pipe_close(wakeup_pipe[1]); + rv1 = apr_file_socket_pipe_close(wakeup_pipe[1]); wakeup_pipe[1] = NULL; } return rv0 ? rv0 : rv1; |