closer to compiling

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

diff --git a/server/mpm/winnt/child.c b/server/mpm/winnt/child.c
index a4ac6971a7432ccb739a32e4171600ffed12a802..e5a19d59276ea48adda44b0525171176dbb954f6 100644 (file)
--- a/server/mpm/winnt/child.c
+++ b/server/mpm/winnt/child.c
@@ -39,6 +39,7 @@
 #include <malloc.h>
 #include "apr_atomic.h"
 #include "apr_buckets.h"
+#include "scoreboard.h"
 
 #ifdef __MINGW32__
 #include <mswsock.h>

diff --git a/server/mpm/winnt/mpm_winnt.c b/server/mpm/winnt/mpm_winnt.c
index 800251ae38f5bdeb8f0129243d7c174359bfbfb4..753543c97f68a089a6dfe318036bd76fd8d3f989 100644 (file)
--- a/server/mpm/winnt/mpm_winnt.c
+++ b/server/mpm/winnt/mpm_winnt.c
@@ -37,7 +37,7 @@
 #include "mpm_common.h"
 #include <malloc.h>
 #include "apr_atomic.h"
-
+#include "scoreboard.h"
 
 /* scoreboard.c does the heavy lifting; all we do is create the child
  * score by moving a handle down the pipe into the child's stdin.
@@ -45,7 +45,7 @@
 extern apr_shm_t *ap_scoreboard_shm;
 
 /* my_generation is returned to the scoreboard code */
-static ap_generation_t volatile my_generation=0;
+static volatile ap_generation_t my_generation=0;
 
 /* Definitions of WINNT MPM specific config globals */
 static HANDLE shutdown_event;  /* used to signal the parent to shutdown */

diff --git a/server/mpm/winnt/mpm_winnt.h b/server/mpm/winnt/mpm_winnt.h
index 8fd4f4d0f7e6117a4007384652e4891561a16d2a..efc1b61c825c97e34eaedc72a08ed9283f303d88 100644 (file)
--- a/server/mpm/winnt/mpm_winnt.h
+++ b/server/mpm/winnt/mpm_winnt.h
@@ -67,6 +67,8 @@ void mpm_nt_eventlog_stderr_flush(void);
 
 /* From mpm_winnt.c: */
 
+extern int ap_threads_per_child;
+
 extern DWORD my_pid;
 extern apr_proc_mutex_t *start_mutex;
 extern HANDLE exit_event;