Commit 73825e0d authored by Bill Stoddard's avatar Bill Stoddard
Browse files

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
parent 6a8eeff5

acinclude.m4

+1 −1
Changes for acinclude.m4: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -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

include/httpd.h

+1 −1
Changes for include/httpd.h: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -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