summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorstoddard <stoddard@13f79535-47bb-0310-9956-ffa450edef68>2000-01-20 22:14:33 +0000
committerstoddard <stoddard@13f79535-47bb-0310-9956-ffa450edef68>2000-01-20 22:14:33 +0000
commit42c47265276d2c2d684ddc7191c58a569ba38429 (patch)
tree45a8b57824a078be83f71731290a3fa0cc14f202
parent9c7b8dd5ba175fb10f746078fb66f152433a4871 (diff)
downloadlibapr-42c47265276d2c2d684ddc7191c58a569ba38429.tar.gz
Convert HAVE_NETINET... to the APR mac
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@59610 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--include/arch/unix/networkio.h2
-rw-r--r--lib/apr_snprintf.c2
-rw-r--r--network_io/unix/networkio.h2
-rw-r--r--network_io/unix/sockaddr.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/include/arch/unix/networkio.h b/include/arch/unix/networkio.h
index f96da2db8..5547fdc42 100644
--- a/include/arch/unix/networkio.h
+++ b/include/arch/unix/networkio.h
@@ -86,7 +86,7 @@
#if HAVE_NETINET_TCP_H
#include <netinet/tcp.h>
#endif
-#if HAVE_NETINET_IN_H
+#if APR_HAVE_NETINET_IN_H
#include <netinet/in.h>
#endif
#if HAVE_ARPA_INET_H
diff --git a/lib/apr_snprintf.c b/lib/apr_snprintf.c
index a4ca094d2..23dc6e9c8 100644
--- a/lib/apr_snprintf.c
+++ b/lib/apr_snprintf.c
@@ -70,7 +70,7 @@
#ifdef HAVE_CTYPE_H
#include <ctype.h>
#endif
-#ifdef HAVE_NETINET_IN_H
+#if APR_HAVE_NETINET_IN_H
#include <netinet/in.h>
#endif
#ifdef HAVE_SYS_SOCKET_H
diff --git a/network_io/unix/networkio.h b/network_io/unix/networkio.h
index f96da2db8..5547fdc42 100644
--- a/network_io/unix/networkio.h
+++ b/network_io/unix/networkio.h
@@ -86,7 +86,7 @@
#if HAVE_NETINET_TCP_H
#include <netinet/tcp.h>
#endif
-#if HAVE_NETINET_IN_H
+#if APR_HAVE_NETINET_IN_H
#include <netinet/in.h>
#endif
#if HAVE_ARPA_INET_H
diff --git a/network_io/unix/sockaddr.c b/network_io/unix/sockaddr.c
index 6603099d7..3507534ba 100644
--- a/network_io/unix/sockaddr.c
+++ b/network_io/unix/sockaddr.c
@@ -203,7 +203,7 @@ ap_status_t ap_get_remote_ipaddr(char **addr, const struct socket_t *sock)
-#if HAVE_NETINET_IN_H
+#if APR_HAVE_NETINET_IN_H
/* ***APRDOC********************************************************
* ap_status_t ap_get_local_name(struct sockaddr_in **name, const ap_socket_t *socket)
* Return the local socket name as a BSD style struct sockaddr_in.