From: Jim Jagielski <jim@apache.org>
Date: Mon, 4 Mar 2013 11:26:17 +0000 (+0000)
Subject: apr trunk-able
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c395491e3bf8400487dd05dc92acca07f4e5e1c5;p=thirdparty%2Fapache%2Fhttpd.git

apr trunk-able


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

diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c
index f4f6a4e54d6..f342a748340 100644
--- a/modules/proxy/proxy_util.c
+++ b/modules/proxy/proxy_util.c
@@ -34,7 +34,9 @@
 #if APR_HAVE_SYS_UN_H
 #include <sys/un.h>
 #endif
+#if (APR_MAJOR_VERSION < 2)
 #include "apr_support.h"        /* for apr_wait_for_io_or_timeout() */
+#endif
 
 APLOG_USE_MODULE(proxy);