wrowe 2003/10/15 13:41:44
Modified: include apr_portable.h
misc/win32 rand.c
network_io/os2 sockets.c
network_io/unix sockets.c
network_io/win32 sockets.c
Log:
Time to turn on the protocol member for APR 1.0.
Revision Changes Path
1.88 +0 -2 apr/include/apr_portable.h
Index: apr_portable.h
===================================================================
RCS file: /home/cvs/apr/include/apr_portable.h,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- apr_portable.h 5 Mar 2003 21:22:26 -0000 1.87
+++ apr_portable.h 15 Oct 2003 20:41:44 -0000 1.88
@@ -221,9 +221,7 @@
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;
1.22 +0 -4 apr/misc/win32/rand.c
Index: rand.c
===================================================================
RCS file: /home/cvs/apr/misc/win32/rand.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- rand.c 13 Jan 2003 18:23:09 -0000 1.21
+++ rand.c 15 Oct 2003 20:41:44 -0000 1.22
@@ -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;
1.66 +0 -4 apr/network_io/os2/sockets.c
Index: sockets.c
===================================================================
RCS file: /home/cvs/apr/network_io/os2/sockets.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- sockets.c 3 Sep 2003 14:43:52 -0000 1.65
+++ sockets.c 15 Oct 2003 20:41:44 -0000 1.66
@@ -283,11 +283,7 @@
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) {
1.112 +0 -4 apr/network_io/unix/sockets.c
Index: sockets.c
===================================================================
RCS file: /home/cvs/apr/network_io/unix/sockets.c,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- sockets.c 3 Sep 2003 14:43:52 -0000 1.111
+++ sockets.c 15 Oct 2003 20:41:44 -0000 1.112
@@ -356,11 +356,7 @@
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) {
1.99 +0 -4 apr/network_io/win32/sockets.c
Index: sockets.c
===================================================================
RCS file: /home/cvs/apr/network_io/win32/sockets.c,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- sockets.c 3 Sep 2003 16:31:47 -0000 1.98
+++ sockets.c 15 Oct 2003 20:41:44 -0000 1.99
@@ -445,11 +445,7 @@
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;
