remove these deprecated interfaces:

apr_accept, apr_bind, apr_connect, apr_listen, apr_shutdown,
apr_socket_create_ex, MAX_SECONDS_TO_LINGER


git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@64604 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 2 insertions, 39 deletions

diff --git a/network_io/os2/sockets.c b/network_io/os2/sockets.c
index 68061cd8d..899e31227 100644
--- a/network_io/os2/sockets.c
+++ b/network_io/os2/sockets.c
@@ -111,8 +111,8 @@ APR_DECLARE(apr_status_t) apr_socket_protocol_get(apr_socket_t *sock, int *proto
     return APR_SUCCESS;
 }
 
-APR_DECLARE(apr_status_t) apr_socket_create_ex(apr_socket_t **new, int family, int type,
-                                               int protocol, apr_pool_t *cont)
+APR_DECLARE(apr_status_t) apr_socket_create(apr_socket_t **new, int family, int type,
+                                            int protocol, apr_pool_t *cont)
 {
     int downgrade = (family == AF_UNSPEC);
 
@@ -146,12 +146,6 @@ APR_DECLARE(apr_status_t) apr_socket_create_ex(apr_socket_t **new, int family, i
     return APR_SUCCESS;
 } 
 
-APR_DECLARE(apr_status_t) apr_socket_create(apr_socket_t **new, int family, int type,
-                                            apr_pool_t *cont)
-{
-    return apr_socket_create_ex(new, family, type, 0, cont);
-}
-
 APR_DECLARE(apr_status_t) apr_socket_shutdown(apr_socket_t *thesocket, 
                                               apr_shutdown_how_e how)
 {
@@ -344,34 +338,3 @@ APR_IMPLEMENT_INHERIT_SET(socket, inherit, cntxt, socket_cleanup)
 
 APR_IMPLEMENT_INHERIT_UNSET(socket, inherit, cntxt, socket_cleanup)
 
-/* deprecated */
-APR_DECLARE(apr_status_t) apr_shutdown(apr_socket_t *thesocket, 
-                                       apr_shutdown_how_e how)
-{
-    return apr_socket_shutdown(thesocket, how);
-}
-
-/* deprecated */
-APR_DECLARE(apr_status_t) apr_bind(apr_socket_t *sock, apr_sockaddr_t *sa)
-{
-    return apr_socket_bind(sock, sa);
-}
-
-/* deprecated */
-APR_DECLARE(apr_status_t) apr_listen(apr_socket_t *sock, apr_int32_t backlog)
-{
-    return apr_socket_listen(sock, backlog);
-}
-
-/* deprecated */
-APR_DECLARE(apr_status_t) apr_accept(apr_socket_t **new, apr_socket_t *sock,
-                                     apr_pool_t *connection_context)
-{
-    return apr_socket_accept(new, sock, connection_context);
-}
-
-/* deprecated */
-APR_DECLARE(apr_status_t) apr_connect(apr_socket_t *sock, apr_sockaddr_t *sa)
-{
-    return apr_socket_connect(sock, sa);
-}