From: Jeff Trawick <trawick@apache.org>
Date: Wed, 17 Sep 2003 01:51:55 +0000 (+0000)
Subject: merge this from 2.1-dev:
X-Git-Tag: 2.0.48~70
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=52829f0886a79e60c4c23d681bf158ea2d5ed450;p=thirdparty%2Fapache%2Fhttpd.git

merge this from 2.1-dev:

    * fix extern "C" declaration of util_ebcdic.h. PR: 22203
        include/util_ebcdic.h: r1.15

(nothing in CH-CH-CH-CH-CHANGES)

PR:             22203
Submitted by:	Andr�� Malo
Reviewed by:	trawick, fielding


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

diff --git a/STATUS b/STATUS
index 3c2916e5437..40244729b61 100644
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2003/09/16 13:37:32 $]
+Last modified at [$Date: 2003/09/17 01:51:55 $]
 
 Release:
 
@@ -277,10 +277,6 @@ PATCHES TO PORT FROM 2.1
       +1: nd, trawick
       (gstein likes the concept, but needs to review...)
 
-    * fix extern "C" declaration of util_ebcdic.h. PR: 22203
-        include/util_ebcdic.h: r1.15
-      +1: nd, trawick, fielding
-
     * Avoid an infinite recursion, which occured if the name of an included
       config file or directory contained a wildcard character. PR 22194.
       (2.0 + 1.3)
diff --git a/include/util_ebcdic.h b/include/util_ebcdic.h
index f7cca743988..5c7ba9ff839 100644
--- a/include/util_ebcdic.h
+++ b/include/util_ebcdic.h
@@ -104,10 +104,6 @@ void ap_xlate_proto_from_ascii(char *buffer, apr_size_t len);
  */
 int ap_rvputs_proto_in_ascii(request_rec *r, ...);
 
-#ifdef __cplusplus
-}
-#endif
-
 #else   /* APR_CHARSET_EBCDIC */
 
 #define ap_xlate_proto_to_ascii(x,y)          /* NOOP */
@@ -116,5 +112,9 @@ int ap_rvputs_proto_in_ascii(request_rec *r, ...);
 #define ap_rvputs_proto_in_ascii  ap_rvputs
 
 #endif  /* APR_CHARSET_EBCDIC */
-    
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif  /* !APACHE_UTIL_EBCDIC_H */