Commit 8751045c authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files 

  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
parent b308b525

server/mpm/winnt/mpm.h

+2 −0
Original line number Diff line number Diff line
@@ -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;

server/mpm/winnt/mpm_winnt.c

+0 −1
Original line number Diff line number Diff line
@@ -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

server/scoreboard.c

+3 −1
Original line number Diff line number Diff line
@@ -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)