diff options
| -rw-r--r-- | include/apr_portable.h | 2 | ||||
| -rw-r--r-- | misc/win32/rand.c | 4 | ||||
| -rw-r--r-- | network_io/os2/sockets.c | 4 | ||||
| -rw-r--r-- | network_io/unix/sockets.c | 4 | ||||
| -rw-r--r-- | network_io/win32/sockets.c | 4 |
5 files changed, 0 insertions, 18 deletions
diff --git a/include/apr_portable.h b/include/apr_portable.h index 6f79f45cd..3b7c9c718 100644 --- a/include/apr_portable.h +++ b/include/apr_portable.h @@ -221,9 +221,7 @@ struct apr_os_sock_info_t { struct sockaddr *remote; /**< NULL if not connected */ int family; /**< always required (APR_INET, APR_INET6, etc.) */ int type; /**< always required (SOCK_STREAM, SOCK_DGRAM, etc.) */ -#ifdef APR_ENABLE_FOR_1_0 /**< enable with APR 1.0 */ int protocol; /**< 0 or actual protocol (APR_PROTO_SCTP, APR_PROTO_TCP, etc.) */ -#endif }; typedef struct apr_os_sock_info_t apr_os_sock_info_t; diff --git a/misc/win32/rand.c b/misc/win32/rand.c index fa43aebd9..29999d61b 100644 --- a/misc/win32/rand.c +++ b/misc/win32/rand.c @@ -61,11 +61,7 @@ APR_DECLARE(apr_status_t) apr_generate_random_bytes(unsigned char * buf, -#ifdef APR_ENABLE_FOR_1_0 apr_size_t length) -#else - int length) -#endif { HCRYPTPROV hProv; apr_status_t res = APR_SUCCESS; diff --git a/network_io/os2/sockets.c b/network_io/os2/sockets.c index 899e31227..5c13fe39f 100644 --- a/network_io/os2/sockets.c +++ b/network_io/os2/sockets.c @@ -283,11 +283,7 @@ APR_DECLARE(apr_status_t) apr_os_sock_make(apr_socket_t **apr_sock, apr_pool_t *cont) { alloc_socket(apr_sock, cont); -#ifdef APR_ENABLE_FOR_1_0 /* no protocol field yet */ set_socket_vars(*apr_sock, os_sock_info->family, os_sock_info->type, os_sock_info->protocol); -#else - set_socket_vars(*apr_sock, os_sock_info->family, os_sock_info->type, 0); -#endif (*apr_sock)->timeout = -1; (*apr_sock)->socketdes = *os_sock_info->os_sock; if (os_sock_info->local) { diff --git a/network_io/unix/sockets.c b/network_io/unix/sockets.c index 0c9939327..0a8c89001 100644 --- a/network_io/unix/sockets.c +++ b/network_io/unix/sockets.c @@ -356,11 +356,7 @@ apr_status_t apr_os_sock_make(apr_socket_t **apr_sock, apr_pool_t *cont) { alloc_socket(apr_sock, cont); -#ifdef APR_ENABLE_FOR_1_0 /* no protocol field yet */ set_socket_vars(*apr_sock, os_sock_info->family, os_sock_info->type, os_sock_info->protocol); -#else - set_socket_vars(*apr_sock, os_sock_info->family, os_sock_info->type, 0); -#endif (*apr_sock)->timeout = -1; (*apr_sock)->socketdes = *os_sock_info->os_sock; if (os_sock_info->local) { diff --git a/network_io/win32/sockets.c b/network_io/win32/sockets.c index f19b41617..ee8d15a4f 100644 --- a/network_io/win32/sockets.c +++ b/network_io/win32/sockets.c @@ -445,11 +445,7 @@ APR_DECLARE(apr_status_t) apr_os_sock_make(apr_socket_t **apr_sock, apr_pool_t *cont) { alloc_socket(apr_sock, cont); -#ifdef APR_ENABLE_FOR_1_0 /* no protocol field yet */ set_socket_vars(*apr_sock, os_sock_info->family, os_sock_info->type, os_sock_info->protocol); -#else - set_socket_vars(*apr_sock, os_sock_info->family, os_sock_info->type, 0); -#endif (*apr_sock)->timeout = -1; (*apr_sock)->disconnected = 0; (*apr_sock)->socketdes = *os_sock_info->os_sock; |