svn commit: r758336 - in /httpd/httpd/trunk/server/mpm/winnt: child.c mpm_winnt.c mpm_winnt.h

[wr...@apache.org]

Author: wrowe
Date: Wed Mar 25 16:34:39 2009
New Revision: 758336

URL: http://svn.apache.org/viewvc?rev=758336&view=rev
Log:
closer to compiling

Modified:
    httpd/httpd/trunk/server/mpm/winnt/child.c
    httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c
    httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.h

Modified: httpd/httpd/trunk/server/mpm/winnt/child.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/winnt/child.c?rev=758336&r1=758335&r2=758336&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/winnt/child.c (original)
+++ httpd/httpd/trunk/server/mpm/winnt/child.c Wed Mar 25 16:34:39 2009
@@ -39,6 +39,7 @@
 #include <malloc.h>
 #include "apr_atomic.h"
 #include "apr_buckets.h"
+#include "scoreboard.h"
 
 #ifdef __MINGW32__
 #include <mswsock.h>

Modified: httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c?rev=758336&r1=758335&r2=758336&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c (original)
+++ httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c Wed Mar 25 16:34:39 2009
@@ -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 */

Modified: httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.h?rev=758336&r1=758335&r2=758336&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.h (original)
+++ httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.h Wed Mar 25 16:34:39 2009
@@ -67,6 +67,8 @@
 
 /* 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;