diff options
| author | Jeff Trawick <trawick@apache.org> | 2003-09-03 21:27:12 +0200 |
|---|---|---|
| committer | Jeff Trawick <trawick@apache.org> | 2003-09-03 21:27:12 +0200 |
| commit | aa21671e13767135f0ee3f88d6a3ff6d039e6534 (patch) | |
| tree | 4076c4ce92c1c44bd68937d2550b470462fb4892 /os/unix | |
| parent | Point to the correct download location. (diff) | |
| download | apache2-aa21671e13767135f0ee3f88d6a3ff6d039e6534.tar.xz apache2-aa21671e13767135f0ee3f88d6a3ff6d039e6534.zip | |
switch to APR 1.0 API (which is still in flux)
because of the changes to the argument lists of apr_mmap_dup and apr_socket_create,
2.1-dev won't build with apr and apr-util's 0.9 branch anymore
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101154 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'os/unix')
| -rw-r--r-- | os/unix/unixd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/os/unix/unixd.c b/os/unix/unixd.c index d5b6c90b8e..595d6f6777 100644 --- a/os/unix/unixd.c +++ b/os/unix/unixd.c @@ -504,7 +504,7 @@ AP_DECLARE(apr_status_t) unixd_accept(void **accepted, ap_listen_rec *lr, int sockdes; *accepted = NULL; - status = apr_accept(&csd, lr->sd, ptrans); + status = apr_socket_accept(&csd, lr->sd, ptrans); if (status == APR_SUCCESS) { *accepted = csd; apr_os_sock_get(&sockdes, csd); @@ -608,7 +608,7 @@ AP_DECLARE(apr_status_t) unixd_accept(void **accepted, ap_listen_rec *lr, * occur in mobile IP. */ ap_log_error(APLOG_MARK, APLOG_EMERG, status, ap_server_conf, - "apr_accept: giving up."); + "apr_socket_accept: giving up."); return APR_EGENERAL; #endif /*ENETDOWN*/ @@ -625,7 +625,7 @@ AP_DECLARE(apr_status_t) unixd_accept(void **accepted, ap_listen_rec *lr, #else default: ap_log_error(APLOG_MARK, APLOG_ERR, status, ap_server_conf, - "apr_accept: (client socket)"); + "apr_socket_accept: (client socket)"); return APR_EGENERAL; #endif } |