diff options
author | William A. Rowe Jr <wrowe@apache.org> | 2001-01-18 23:54:14 +0000 |
---|---|---|
committer | William A. Rowe Jr <wrowe@apache.org> | 2001-01-18 23:54:14 +0000 |
commit | cbf6e71e06f7803f6386c01a977c650aa2a1ff00 (patch) | |
tree | 09bb376888ffe5a7423dbef6355b2ed8683ad156 /support | |
parent | 7c8a252a45bcd9946d9c9f1f22f03e69e095fcf4 (diff) | |
download | httpd-cbf6e71e06f7803f6386c01a977c650aa2a1ff00.tar.gz |
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
Diffstat (limited to 'support')
-rw-r--r-- | support/ab.c | 11 | ||||
-rw-r--r-- | support/htdigest.c | 7 |
2 files changed, 14 insertions, 4 deletions
diff --git a/support/ab.c b/support/ab.c index b99cf5384e..420e5cffda 100644 --- 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><%s></i> apache-2.0<br>\n", AB_VERSION, "$Revision: 1.50 $"); + printf(" This is ApacheBench, Version %s <i><%s></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 3162fdc255..be9b954263 100644 --- 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 |