From: Bill Stoddard <stoddard@apache.org>
Date: Fri, 21 Jan 2000 01:25:25 +0000 (+0000)
Subject: Back out most of the last commit. Keep APR macros seperate from Apache
X-Git-Tag: 1.3.13~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=620c82bd75a36e529b4b2c25d5c0f53a9876ef51;p=thirdparty%2Fapache%2Fhttpd.git

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 3df23304961..195270220a3 100644
--- 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 a1aa55eab9e..51a8d05810c 100644
--- 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