From: Guenter Knauf <fuankg@apache.org>
Date: Thu, 4 Jul 2013 20:18:00 +0000 (+0000)
Subject: Applied.
X-Git-Tag: 2.4.5~40
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2235284d3bfcfd498d8a1d67d7f928fad3032b39;p=apache

Applied.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1499856 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/STATUS b/STATUS
index 385d3a8f80..8a3d7840de 100644
--- a/STATUS
+++ b/STATUS
@@ -113,16 +113,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
         This changes the format of the updatesession SQL statement. Existing
         configurations must be changed.
 
-  * ap_release.h: avoid including apr_general.h.
-    The MSVC Resource Compiler truncates macro names at char 31.
-    Since apr_general.h includes apr.h which in turn includes
-    system headers we get warnings or errors with the Resource
-    Compiler with newer system headers (VC10 and later) which
-    have macro names defined with more than 31 chars.
-    trunk patch: http://svn.apache.org/r1499742
-    2.4.x patch: trunk patch works
-    +1: fuankg, gsmith, sf
-
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]