Commit 55449a12 authored by Brian Havard's avatar Brian Havard
Browse files

Declaration of ap_reclaim_child_processes() in exports.c needs to be 

conditional in the same way that the function's definition is so give it a
suitable macro that will be recogized by the scripts that make exports.c.


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

include/mpm_common.h

+2 −0
Original line number Diff line number Diff line
@@ -110,7 +110,9 @@ extern "C" { 
 *  MPM_NOTE_CHILD_KILLED -- Note the child died in the scoreboard

 * </PRE>

 */

#if AP_MPM_NEEDS_RECLAIM_CHILD_PROCESSES

void ap_reclaim_child_processes(int terminate);

#endif



/**

 * Determine if any child process has died.  If no child process died, then

server/mpm/beos/mpm.h

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ 
#define BEOS_MPM

#include "scoreboard.h"



#define MPM_NEEDS_RECLAIM_CHILD_PROCESSES 1

#define AP_MPM_NEEDS_RECLAIM_CHILD_PROCESSES 1

#define MPM_SYNC_CHILD_TABLE()

#define MPM_CHILD_PID(i) (ap_scoreboard_image->servers[0][i].tid)

#define MPM_NOTE_CHILD_KILLED(i) (MPM_CHILD_PID(i) = 0)

server/mpm/experimental/perchild/mpm.h

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ 


#define PERCHILD_MPM



#define MPM_NEEDS_RECLAIM_CHILD_PROCESSES 1

#define AP_MPM_NEEDS_RECLAIM_CHILD_PROCESSES 1

#define MPM_SYNC_CHILD_TABLE()

#define MPM_CHILD_PID(i) (ap_child_table[i].pid)

#define MPM_NOTE_CHILD_KILLED(i) (MPM_CHILD_PID(i) = 0)

server/mpm/perchild/mpm.h

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ 


#define PERCHILD_MPM



#define MPM_NEEDS_RECLAIM_CHILD_PROCESSES 1

#define AP_MPM_NEEDS_RECLAIM_CHILD_PROCESSES 1

#define MPM_SYNC_CHILD_TABLE()

#define MPM_CHILD_PID(i) (ap_child_table[i].pid)

#define MPM_NOTE_CHILD_KILLED(i) (MPM_CHILD_PID(i) = 0)

server/mpm/prefork/mpm.h

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ 


#define PREFORK_MPM



#define MPM_NEEDS_RECLAIM_CHILD_PROCESSES 1

#define AP_MPM_NEEDS_RECLAIM_CHILD_PROCESSES 1

#define MPM_SYNC_CHILD_TABLE() (ap_sync_scoreboard_image())

#define MPM_CHILD_PID(i) (ap_scoreboard_image->parent[i].pid)

#define MPM_NOTE_CHILD_KILLED(i) (MPM_CHILD_PID(i) = 0)