PR:

Obtained from:
Submitted by:
Reviewed by:

  One reason ap_config.h can be a problem.  Change VERSION->AB_VERSION to
  avoid ap_config.h #undef.

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

diff --git a/support/ab.c b/support/ab.c
index 6534698d5f868fdce706d8f76f3bac9d6a9df16b..9c8c484bf8832adeeea4234272d045bac3fc2c8c 100644 (file)
--- a/support/ab.c
+++ b/support/ab.c
@@ -98,7 +98,7 @@
  *   only an issue for loopback usage
  */
 
-#define VERSION "1.3c"
+#define AB_VERSION "1.3c"
 
 /*  -------------------------------------------------------------------- */
 
@@ -740,7 +740,7 @@ static void test(void)
                "%s" "\r\n",
                (posting == 0) ? "GET" : "HEAD",
                path,
-               VERSION,
+               AB_VERSION,
                keepalive ? "Connection: Keep-Alive\r\n" : "",
                cookie, auth, hostname, hdrs);
     }
@@ -755,7 +755,7 @@ static void test(void)
                "%s"
                "\r\n",
                path,
-               VERSION,
+               AB_VERSION,
                keepalive ? "Connection: Keep-Alive\r\n" : "",
                cookie, auth,
                hostname, postlen,
@@ -840,14 +840,14 @@ static void test(void)
 static void copyright(void)
 {
     if (!use_html) {
-        printf("This is ApacheBench, Version %s\n", VERSION " <$Revision: 1.16 $> apache-2.0");
+        printf("This is ApacheBench, Version %s\n", AB_VERSION " <$Revision: 1.17 $> apache-2.0");
         printf("Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/\n");
         printf("Copyright (c) 1998-2000 The Apache Software Foundation, http://www.apache.org/\n");
         printf("\n");
     }
     else {
         printf("<p>\n");
-        printf(" This is ApacheBench, Version %s <i>&lt;%s&gt;</i> apache-2.0<br>\n", VERSION, "$Revision: 1.16 $");
+        printf(" This is ApacheBench, Version %s <i>&lt;%s&gt;</i> apache-2.0<br>\n", AB_VERSION, "$Revision: 1.17 $");
         printf(" Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/<br>\n");
         printf(" Copyright (c) 1998-2000 The Apache Software Foundation, http://www.apache.org/<br>\n");
         printf("</p>\n<p>\n");