trawick 2002/10/18 08:08:09
Modified: network_io/os2 sockets.c
network_io/win32 sockets.c
Log:
fix compile break in OS/2 and Win32 apr_os_sock_make()
Reported by: Brent R. Matzelle <[EMAIL PROTECTED]>
Revision Changes Path
1.59 +2 -2 apr/network_io/os2/sockets.c
Index: sockets.c
===================================================================
RCS file: /home/cvs/apr/network_io/os2/sockets.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- sockets.c 18 Oct 2002 14:13:38 -0000 1.58
+++ sockets.c 18 Oct 2002 15:08:08 -0000 1.59
@@ -260,9 +260,9 @@
{
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, 0);
-#else
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;
1.89 +2 -2 apr/network_io/win32/sockets.c
Index: sockets.c
===================================================================
RCS file: /home/cvs/apr/network_io/win32/sockets.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- sockets.c 18 Oct 2002 14:13:38 -0000 1.88
+++ sockets.c 18 Oct 2002 15:08:09 -0000 1.89
@@ -425,9 +425,9 @@
{
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, 0);
-#else
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;
