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

diff --git a/include/mpm_common.h b/include/mpm_common.h
index 96b745588bd6b7a6aba5e3457f1ee75c4d727cfc..4d063b8ff465bfd8d86001f2e29885b3b97a60d6 100644 (file)
--- 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 b0e51c1a7e30774063ace58c2bb606be8f1efd7f..e6de2765569cea518aacc54d69fc2828823bb4d7 100644 (file)
--- 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 557c9cd0a55fda01949344562ad457401ab6aa75..d360ae67d6e643747d3b6a391a18d54d4205e8f5 100644 (file)
--- 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 557c9cd0a55fda01949344562ad457401ab6aa75..d360ae67d6e643747d3b6a391a18d54d4205e8f5 100644 (file)
--- 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 0f4163ece3bf844aaa7179beee8167ade82c8700..debd270e253c26ea6b89a6c9520cc6a139b19708 100644 (file)
--- 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 0f47e049569a7c643f4530b14dcbcfda935c9cf2..a6ea915e6280c991cbf6d79e4da0f9505aeaa2e9 100644 (file)
--- 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 cadc7f076c64470a3c3801161a1af110c70c613f..d9ecdb00d8a1f4969b4e457e2941aeb0b9a76b33 100644 (file)
--- 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;