When is a void fn(void) not a void fn(void)? It's a win32'ism, since

  the APR_DECLARE (excluding _NONSTD) uses the pascal convention.  Really
  irrelevant in a function that never needs to clean up (atexit), but
  the compiler complains.  Possible workarounds, but that would break
  non-c lanaguge code from linking into apr.

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

diff --git a/support/ab.c b/support/ab.c
index b99cf5384e71df96d80a78672fc9c93b87e4d4e9..420e5cffda9a2f81f284c4ebf12888d3aefe36e7 100644 (file)
--- a/support/ab.c
+++ b/support/ab.c
@@ -903,14 +903,14 @@ static void test(void)
 static void copyright(void)
 {
     if (!use_html) {
-        printf("This is ApacheBench, Version %s\n", AB_VERSION " <$Revision: 1.50 $> apache-2.0");
+        printf("This is ApacheBench, Version %s\n", AB_VERSION " <$Revision: 1.51 $> 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.50 $");
+        printf(" This is ApacheBench, Version %s <i>&lt;%s&gt;</i> apache-2.0<br>\n", AB_VERSION, "$Revision: 1.51 $");
         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");
@@ -1025,6 +1025,11 @@ static int open_postfile(const char *pfile)
     return 0;
 }
 
+static void terminate(void)
+{
+    apr_terminate();
+}
+
 /* ------------------------------------------------------- */
 
 /* sort out command-line args and call test */
@@ -1046,7 +1051,7 @@ int main(int argc, const char * const argv[])
     hdrs[0] = '\0';
 
     apr_initialize();
-    atexit(apr_terminate);
+    atexit(terminate);
     apr_create_pool(&cntxt, NULL);
 
 #ifdef NOT_ASCII

diff --git a/support/htdigest.c b/support/htdigest.c
index 3162fdc255265b0c5f230e7ae529d828ee69d31f..be9b954263b43981dc8649f4f28fccf2fabe10ba 100644 (file)
--- a/support/htdigest.c
+++ b/support/htdigest.c
@@ -215,6 +215,11 @@ static void interrupted(void)
     exit(1);
 }
 
+static void terminate(void)
+{
+    apr_terminate();
+}
+
 int main(int argc, char *argv[])
 {
     apr_file_t *tfp = NULL, *f;
@@ -234,7 +239,7 @@ int main(int argc, char *argv[])
                 apr_strerror(rv, line, sizeof(line)), rv);
         exit(1);
     }
-    atexit(apr_terminate); 
+    atexit(terminate); 
     apr_create_pool(&cntxt, NULL);
 
 #if APR_CHARSET_EBCDIC