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 4c17b8a55f833b00a5797f89ad4e11cd5fbe9e01..9d8bb4ef336a23159aa54485ac319400513a3e1c 100644 (file)
--- 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 9910c7d9bbbd35df65963398cb4f874aab9ded2f..00f2abdd8fcde8c665fea9443a933bed745b914c 100644 (file)
--- 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 dd4feb365f18e7db19e8a6fc14ca15b79c0d9134..e575e53423dfc4025b9acf9c5d7327396d11ba6e 100644 (file)
--- 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)