Cleanups so that the support programs build cleanly. The Win32 values

need to be sanity checked.
Submitted by:	Cliff Woolley <cliffwoolley@yahoo.com>
Reviewed by:	Ryan Bloom

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

diff --git a/CHANGES b/CHANGES
index 79e864f87f740c10b1f9b50e0f82f3255eb48d68..7ebeb8f1f5e0e995c297476aea7421dabef82c35 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 2.0b1
 
+  *) Get the support programs building cleanly again.
+     [Cliff Woolley <cliffwoolley@yahoo.com>]
+
   *) The Apache/Win32 Apache.exe and dll's now live in bin.  The 
      current directory logic now backs up over bin/ to determine the
      server root from the Apache.exe path.

diff --git a/support/ab.c b/support/ab.c
index 9f6bf442be30ce58fd91a9459cb2da5addd35a6d..da2a5d69615d929b79c082af216597c6937d3911 100644 (file)
--- a/support/ab.c
+++ b/support/ab.c
@@ -125,6 +125,9 @@
 #if APR_HAVE_STDIO_H
 #include <stdio.h>              /* for EOF */
 #endif
+#if APR_HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
 
 #include "ap_base64.h"
 #ifdef NOT_ASCII
@@ -893,14 +896,14 @@ static void test(void)
 static void copyright(void)
 {
     if (!use_html) {
-        printf("This is ApacheBench, Version %s\n", AB_VERSION " <$Revision: 1.45 $> apache-2.0");
+        printf("This is ApacheBench, Version %s\n", AB_VERSION " <$Revision: 1.46 $> 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", AB_VERSION, "$Revision: 1.45 $");
+        printf(" This is ApacheBench, Version %s <i>&lt;%s&gt;</i> apache-2.0<br>\n", AB_VERSION, "$Revision: 1.46 $");
         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");

diff --git a/support/htpasswd.c b/support/htpasswd.c
index 8b1cde9c5ab326e762cbe3aade09939d868515ae..d8e66536acbfe1a54efd32358308ae9c919b52f1 100644 (file)
--- a/support/htpasswd.c
+++ b/support/htpasswd.c
@@ -100,6 +100,15 @@
 #if APR_HAVE_CRYPT_H
 #include <crypt.h>
 #endif
+#if APR_HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#if APR_HAVE_STRING_H
+#include <string.h>
+#endif
+#if APR_HAVE_UNISTD_H
+#include <unistd.h>
+#endif
 
 #ifdef WIN32
 #include <conio.h>

diff --git a/support/logresolve.c b/support/logresolve.c
index aa708997f8953213d292dcd5535d1c97a4bbb4d1..c88c355e8add58c6d918857cb66c1a3916f1ea18 100644 (file)
--- a/support/logresolve.c
+++ b/support/logresolve.c
@@ -43,6 +43,9 @@
 #if APR_HAVE_STDIO_H
 #include <stdio.h>
 #endif
+#if APR_HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
 #if APR_HAVE_CTYPE_H
 #include <ctype.h>
 #endif
@@ -52,6 +55,9 @@
 #if APR_HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
+#if APR_HAVE_STRING_H
+#include <string.h>
+#endif
 #if APR_HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif