You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2001/07/18 23:13:05 UTC
cvs commit: httpd-2.0/server/mpm/winnt mpm.h mpm_winnt.c
wrowe 01/07/18 14:13:04
Modified: server scoreboard.c
server/mpm/winnt mpm.h mpm_winnt.c
Log:
Fix ap_create_scoreboard fooness on Win32.
Revision Changes Path
1.30 +3 -1 httpd-2.0/server/scoreboard.c
Index: scoreboard.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/scoreboard.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- scoreboard.c 2001/07/18 20:45:35 1.29
+++ scoreboard.c 2001/07/18 21:13:04 1.30
@@ -171,8 +171,10 @@
*
* 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)
1.6 +2 -0 httpd-2.0/server/mpm/winnt/mpm.h
Index: mpm.h
===================================================================
RCS file: /home/cvs/httpd-2.0/server/mpm/winnt/mpm.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mpm.h 2001/04/13 19:00:39 1.5
+++ mpm.h 2001/07/18 21:13:04 1.6
@@ -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;
1.167 +0 -1 httpd-2.0/server/mpm/winnt/mpm_winnt.c
Index: mpm_winnt.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/mpm/winnt/mpm_winnt.c,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- mpm_winnt.c 2001/07/18 20:45:36 1.166
+++ mpm_winnt.c 2001/07/18 21:13:04 1.167
@@ -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