From: Joe Orton <jorton@apache.org>
Date: Fri, 13 Jan 2006 14:05:30 +0000 (+0000)
Subject: Propose a better fix for the C++ issue.
X-Git-Tag: 2.2.1~140
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4bbb0a47aeb651814d6be6154d1b0d67fbb9fb44;p=thirdparty%2Fapache%2Fhttpd.git

Propose a better fix for the C++ issue.


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

diff --git a/STATUS b/STATUS
index d2ecb4a2020..c0f69bcbd26 100644
--- a/STATUS
+++ b/STATUS
@@ -157,7 +157,9 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
 
     * Fix for AP_HAVE_DESIGNATED_INITIALIZER vs C++ compilers
          http://svn.apache.org/viewcvs?rev=356234&view=rev
-      +1: jorton, niq
+       + http://svn.apache.org/viewcvs?rev=356248&view=rev
+       = http://people.apache.org/~jorton/httpd-2.2.0-cppheader.patch
+      +1: jorton
 
     * Fix mis-shifted 32 bit scope, masked to 64 bits as a method.
         URL: http://svn.apache.org/viewcvs?rev=358040&view=rev