hgomez 2003/08/26 03:07:37
Modified: jk/native2/common jk_channel_socket.c
jk/native/common jk_connect.c
Log:
Make use of in_addr_t instead of u_long for all platforms but OS400.
Should make jk build on OpenBSD/64
Revision Changes Path
1.55 +6 -1 jakarta-tomcat-connectors/jk/native2/common/jk_channel_socket.c
Index: jk_channel_socket.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_channel_socket.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- jk_channel_socket.c 31 Jul 2003 14:49:32 -0000 1.54
+++ jk_channel_socket.c 26 Aug 2003 10:07:36 -0000 1.55
@@ -246,8 +246,13 @@
int x;
/* TODO: Should be updated for IPV6 support. */
- /* for now use the correct type, in_addr_t */
+ /* for now use the correct type, in_addr_t (or u_long for OS400) */
+
+#ifdef AS400
+ u_long laddr;
+#else
in_addr_t laddr;
+#endif
rc->sin_port = htons((short)port);
rc->sin_family = AF_INET;
1.11 +7 -1 jakarta-tomcat-connectors/jk/native/common/jk_connect.c
Index: jk_connect.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_connect.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- jk_connect.c 25 Jul 2003 14:58:22 -0000 1.10
+++ jk_connect.c 26 Aug 2003 10:07:37 -0000 1.11
@@ -110,7 +110,13 @@
int x;
/* TODO: Should be updated for IPV6 support. */
+ /* for now use the correct type, in_addr_t (or u_long for OS400) */
+
+#ifdef AS400
u_long laddr;
+#else
+ in_addr_t laddr;
+#endif
rc->sin_port = htons((short)port);
rc->sin_family = AF_INET;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
