diff options
| author | Brian Havard <bjh@apache.org> | 2001-03-19 13:07:28 +0000 |
|---|---|---|
| committer | Brian Havard <bjh@apache.org> | 2001-03-19 13:07:28 +0000 |
| commit | 7c7bd950fdde04837eca3d2ca4309b770d61856c (patch) | |
| tree | 42f68904fc201a1504a6d1d656c9bbf1081a2a58 | |
| parent | 8251bfc3d91dd70b5dc10bab3306926ae1604fce (diff) | |
| download | httpd-7c7bd950fdde04837eca3d2ca4309b770d61856c.tar.gz | |
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
| -rw-r--r-- | include/mpm_common.h | 2 | ||||
| -rw-r--r-- | server/mpm/beos/mpm.h | 2 | ||||
| -rw-r--r-- | server/mpm/experimental/perchild/mpm.h | 2 | ||||
| -rw-r--r-- | server/mpm/perchild/mpm.h | 2 | ||||
| -rw-r--r-- | server/mpm/prefork/mpm.h | 2 | ||||
| -rw-r--r-- | server/mpm/threaded/mpm.h | 2 | ||||
| -rw-r--r-- | server/mpm_common.c | 2 |
7 files changed, 8 insertions, 6 deletions
diff --git a/include/mpm_common.h b/include/mpm_common.h index 96b745588b..4d063b8ff4 100644 --- a/include/mpm_common.h +++ b/include/mpm_common.h @@ -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 diff --git a/server/mpm/beos/mpm.h b/server/mpm/beos/mpm.h index b0e51c1a7e..e6de276556 100644 --- a/server/mpm/beos/mpm.h +++ b/server/mpm/beos/mpm.h @@ -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) diff --git a/server/mpm/experimental/perchild/mpm.h b/server/mpm/experimental/perchild/mpm.h index 557c9cd0a5..d360ae67d6 100644 --- a/server/mpm/experimental/perchild/mpm.h +++ b/server/mpm/experimental/perchild/mpm.h @@ -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) diff --git a/server/mpm/perchild/mpm.h b/server/mpm/perchild/mpm.h index 557c9cd0a5..d360ae67d6 100644 --- a/server/mpm/perchild/mpm.h +++ b/server/mpm/perchild/mpm.h @@ -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) diff --git a/server/mpm/prefork/mpm.h b/server/mpm/prefork/mpm.h index 0f4163ece3..debd270e25 100644 --- a/server/mpm/prefork/mpm.h +++ b/server/mpm/prefork/mpm.h @@ -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) diff --git a/server/mpm/threaded/mpm.h b/server/mpm/threaded/mpm.h index 0f47e04956..a6ea915e62 100644 --- a/server/mpm/threaded/mpm.h +++ b/server/mpm/threaded/mpm.h @@ -63,7 +63,7 @@ #define THREADED_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) diff --git a/server/mpm_common.c b/server/mpm_common.c index cadc7f076c..d9ecdb00d8 100644 --- a/server/mpm_common.c +++ b/server/mpm_common.c @@ -86,7 +86,7 @@ #include <grp.h> #endif -#ifdef MPM_NEEDS_RECLAIM_CHILD_PROCESSES +#ifdef AP_MPM_NEEDS_RECLAIM_CHILD_PROCESSES void ap_reclaim_child_processes(int terminate) { int i; |