Back out most of the last commit. Keep APR macros seperate from Apache

macros.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84504 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/acinclude.m4 b/acinclude.m4
index 3df2330496157d45bc368356a1944a1f3c6ae0dd..195270220a35e0381612aa6917f868433c7c6666 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -157,7 +157,7 @@ AC_DEFUN(APACHE_INADDR_NONE,[
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
-#if APR_HAVE_NETINET_IN_H
+#ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
 #ifdef HAVE_ARPA_INET_H

diff --git a/include/httpd.h b/include/httpd.h
index a1aa55eab9e96b70becbe0a2f4f368bbf575f933..51a8d05810cbaa4bb76d6581a35ff243d3b0de08 100644 (file)
--- a/include/httpd.h
+++ b/include/httpd.h
@@ -81,7 +81,7 @@ extern "C" {
 #include "ap.h"
 #include "ap_mmn.h"
 
-#if APR_HAVE_NETINET_IN_H
+#ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif