From: William A. Rowe Jr Date: Wed, 18 Jul 2001 21:13:04 +0000 (+0000) Subject: Fix ap_create_scoreboard fooness on Win32. X-Git-Tag: 2.0.21~26 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f30a1383e2baec662242a2dae147fec149f05b7;p=thirdparty%2Fapache%2Fhttpd.git Fix ap_create_scoreboard fooness on Win32. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89609 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/server/mpm/winnt/mpm.h b/server/mpm/winnt/mpm.h index 4c17b8a55f8..9d8bb4ef336 100644 --- a/server/mpm/winnt/mpm.h +++ b/server/mpm/winnt/mpm.h @@ -64,6 +64,8 @@ * move most of this stuff to mpm_common.h? */ +#include "scoreboard.h" + #define MPM_NAME "WinNT" extern int ap_threads_per_child; diff --git a/server/mpm/winnt/mpm_winnt.c b/server/mpm/winnt/mpm_winnt.c index 9910c7d9bbb..00f2abdd8fc 100644 --- a/server/mpm/winnt/mpm_winnt.c +++ b/server/mpm/winnt/mpm_winnt.c @@ -73,7 +73,6 @@ #include "mpm_default.h" #include "mpm_winnt.h" #include "mpm_common.h" -#include "scoreboard.h" typedef HANDLE thread; #ifdef CONTAINING_RECORD diff --git a/server/scoreboard.c b/server/scoreboard.c index dd4feb365f1..e575e53423d 100644 --- a/server/scoreboard.c +++ b/server/scoreboard.c @@ -171,8 +171,10 @@ apr_status_t ap_cleanup_scoreboard(void *d) { * * Create or reinit an existing scoreboard. The MPM can control whether * the scoreboard is shared across multiple processes or not + * + * ###: Is there any reason to export this symbol in the first place? */ -AP_DECLARE(void) ap_create_scoreboard(apr_pool_t *p, ap_scoreboard_e sb_type) +AP_DECLARE_NONSTD(void) ap_create_scoreboard(apr_pool_t *p, ap_scoreboard_e sb_type) { int running_gen = 0; if (ap_scoreboard_image)