jorton 2003/10/01 06:19:43
Modified: . configure.in
build apr_network.m4
include apr.h.in apr.hnw apr.hw apr_network_io.h
Log:
* configure.in, build/apr_network.m4: Remove APR_INADDR_NONE
macro.
* include/apr.hw, include/apr.hnw, include/apr.h.in: Don't
define APR_INADDR_NONE here.
* include/apr_network_io.h: Define APR_INADDR_NONE here.
Revision Changes Path
1.539 +0 -2 apr/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apr/configure.in,v
retrieving revision 1.538
retrieving revision 1.539
diff -u -u -r1.538 -r1.539
--- configure.in 29 Sep 2003 16:10:08 -0000 1.538
+++ configure.in 1 Oct 2003 13:19:42 -0000 1.539
@@ -1021,8 +1021,6 @@
APR_CHECK_SOCKLEN_T
-APR_INADDR_NONE
-
dnl Checks for pointer size
AC_CHECK_SIZEOF(void*, 4)
1.28 +0 -35 apr/build/apr_network.m4
Index: apr_network.m4
===================================================================
RCS file: /home/cvs/apr/build/apr_network.m4,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -u -r1.27 -r1.28
--- apr_network.m4 29 Sep 2003 19:38:35 -0000 1.27
+++ apr_network.m4 1 Oct 2003 13:19:42 -0000 1.28
@@ -689,41 +689,6 @@
])
dnl
-dnl APR_INADDR_NONE
-dnl
-dnl checks for missing INADDR_NONE macro
-dnl
-AC_DEFUN(APR_INADDR_NONE,[
- AC_CACHE_CHECK(whether system defines INADDR_NONE, ac_cv_inaddr_none,[
- AC_TRY_COMPILE([
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
-],[
-unsigned long foo = INADDR_NONE;
-],[
- ac_cv_inaddr_none=yes
-],[
- ac_cv_inaddr_none=no
-])])
- if test "$ac_cv_inaddr_none" = "no"; then
- apr_inaddr_none="((unsigned int) 0xffffffff)"
- else
- apr_inaddr_none="INADDR_NONE"
- fi
-])
-
-
-dnl
dnl APR_H_ERRNO_COMPILE_CHECK
dnl
AC_DEFUN(APR_H_ERRNO_COMPILE_CHECK,[
1.126 +0 -5 apr/include/apr.h.in
Index: apr.h.in
===================================================================
RCS file: /home/cvs/apr/include/apr.h.in,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -u -r1.125 -r1.126
--- apr.h.in 29 Sep 2003 16:10:08 -0000 1.125
+++ apr.h.in 1 Oct 2003 13:19:43 -0000 1.126
@@ -266,11 +266,6 @@
*/
#define APR_FILES_AS_SOCKETS @file_as_socket@
-/* Not all platforms have a real INADDR_NONE. This macro replaces
INADDR_NONE
- * on all platforms.
- */
-#define APR_INADDR_NONE @apr_inaddr_none@
-
/* This macro indicates whether or not EBCDIC is the native character set.
*/
#define APR_CHARSET_EBCDIC @apr_charset_ebcdic@
1.35 +0 -5 apr/include/apr.hnw
Index: apr.hnw
===================================================================
RCS file: /home/cvs/apr/include/apr.hnw,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -u -r1.34 -r1.35
--- apr.hnw 15 Apr 2003 21:45:58 -0000 1.34
+++ apr.hnw 1 Oct 2003 13:19:43 -0000 1.35
@@ -234,11 +234,6 @@
*/
#define APR_FILES_AS_SOCKETS 1
-/* Not all platforms have a real INADDR_NONE. This macro replaces
INADDR_NONE
- * on all platforms.
- */
-#define APR_INADDR_NONE INADDR_NONE
-
/* This macro indicates whether or not EBCDIC is the native character set.
*/
#define APR_CHARSET_EBCDIC 0
1.116 +0 -5 apr/include/apr.hw
Index: apr.hw
===================================================================
RCS file: /home/cvs/apr/include/apr.hw,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -u -r1.115 -r1.116
--- apr.hw 15 Apr 2003 22:28:13 -0000 1.115
+++ apr.hw 1 Oct 2003 13:19:43 -0000 1.116
@@ -333,11 +333,6 @@
*/
#define APR_FILES_AS_SOCKETS 0
-/* Not all platforms have a real INADDR_NONE. This macro replaces
INADDR_NONE
- * on all platforms.
- */
-#define APR_INADDR_NONE INADDR_NONE
-
/* This macro indicates whether or not EBCDIC is the native character set.
*/
#define APR_CHARSET_EBCDIC 0
1.146 +10 -0 apr/include/apr_network_io.h
Index: apr_network_io.h
===================================================================
RCS file: /home/cvs/apr/include/apr_network_io.h,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -u -r1.145 -r1.146
--- apr_network_io.h 29 Sep 2003 16:10:08 -0000 1.145
+++ apr_network_io.h 1 Oct 2003 13:19:43 -0000 1.146
@@ -157,6 +157,16 @@
};
#endif
+/** @def APR_INADDR_NONE
+ * Not all platforms have a real INADDR_NONE. This macro replaces
+ * INADDR_NONE on all platforms.
+ */
+#ifdef INADDR_NONE
+#define APR_INADDR_NONE INADDR_NONE
+#else
+#define APR_INADDR_NONE ((unsigned int) 0xffffffff)
+#endif
+
/**
* @def APR_INET
* Not all platforms have these defined, so we'll define them here
