From: Guenter Knauf <fuankg@apache.org>
Date: Wed, 6 Oct 2010 10:18:15 +0000 (+0000)
Subject: Rename macro to a better name and sync with trunk.
X-Git-Tag: 2.0.64~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7246a28bad1d54e4534fb26ac5199d25a14eb3bb;p=thirdparty%2Fapache%2Fhttpd.git

Rename macro to a better name and sync with trunk.
Reviewed by wrowe, rjung.


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

diff --git a/STATUS b/STATUS
index d597c960430..ef528c14175 100644
--- a/STATUS
+++ b/STATUS
@@ -132,12 +132,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  * gen_test_char.c: rename macro to a better name and sync with trunk.
-    Trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1001398
-    2.2.x patch: http://people.apache.org/~fuankg/diffs/gen_test_char.c.diff
-    2.0.x patch: 2.2.x patch applies with offset.
-    +1: fuankg, wrowe, rjung
-
   * Stupid-simple patch specific to give rotatelogs the same behavior
     as the core log writer;
     +1: wrowe, rjung, sf
diff --git a/server/gen_test_char.c b/server/gen_test_char.c
index e606e13fe8e..ef53f9c977f 100644
--- a/server/gen_test_char.c
+++ b/server/gen_test_char.c
@@ -30,7 +30,7 @@
 #include "apr_lib.h"
 
 #if defined(WIN32) || defined(OS2)
-#define WANT_WIN32_OS2
+#define NEED_ENHANCED_ESCAPES
 #endif
 
 #endif
@@ -84,7 +84,7 @@ int main(int argc, char *argv[])
             printf("\n    ");
 
         /* escape_shell_cmd */
-#if defined(WANT_WIN32_OS2)
+#ifdef NEED_ENHANCED_ESCAPES
         /* Win32/OS2 have many of the same vulnerable characters
          * as Unix sh, plus the carriage return and percent char.
          * The proper escaping of these characters varies from unix