Cleanup the MPM #defines. Each MPM #defines a unique name that identifies

it to the system.  That name should be of the format NAME_MPM where name
is something like DEXTER, MPMT_PTHREAD, SPMT_OS2, etc.

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

diff --git a/server/mpm/prefork/mpm.h b/server/mpm/prefork/mpm.h
index c912aa06d17b289251bd75f430a6344d39a02efb..248591716e6b821d6bb114fb98b90d161a17c0e8 100644 (file)
--- a/server/mpm/prefork/mpm.h
+++ b/server/mpm/prefork/mpm.h
@@ -71,4 +71,4 @@ extern scoreboard *ap_scoreboard_image;
 extern server_rec *ap_server_conf;
 extern int ap_my_pid;
 extern char ap_coredump_dir[MAX_STRING_LEN];
-#endif /* APACHE_MPM_DEXTER_H */
+#endif /* APACHE_MPM_PREFORK_H */

diff --git a/server/mpm/spmt_os2/mpm.h b/server/mpm/spmt_os2/mpm.h
index 6f72bca8a776b13b1ba5822a4cf83e10ed8f4a00..a4d6cfcb5b11c78cbc3c5b532727632f18d20a0e 100644 (file)
--- a/server/mpm/spmt_os2/mpm.h
+++ b/server/mpm/spmt_os2/mpm.h
@@ -68,4 +68,4 @@
 extern char ap_coredump_dir[MAX_STRING_LEN];
 extern server_rec *ap_server_conf;
 
-#endif /* APACHE_MPM_DEXTER_H */
+#endif /* APACHE_MPM_SPMT_OS2_H */

diff --git a/server/mpm_common.c b/server/mpm_common.c
index a7b46cc5dc573c54e9b6c72fd84f8183ad4d9c19..696bdf161a461e68f33aa79b922665fe5dfa7bdb 100644 (file)
--- a/server/mpm_common.c
+++ b/server/mpm_common.c
@@ -81,10 +81,10 @@
 #include <sys/socket.h> /* for setsockopt prototype */
 #endif
 
-#if defined(DEXTER) || defined(DEXTER_MPM) || defined(MPMT_BEOS_MPM) || defined(BEOS_MPM)
+#if defined(DEXTER_MPM) || defined(MPMT_BEOS_MPM) || defined(BEOS_MPM) || defined(PERCHILD)
 #define CHILD_TABLE 1
 #define CHILD_INFO_TABLE     ap_child_table
-#elif defined(MPMT_PTHREAD) || defined (PREFORK) || defined(PREFORK_MPM)
+#elif defined(MPMT_PTHREAD) || defined(PREFORK_MPM)
 #define SCOREBOARD 1
 #define CHILD_INFO_TABLE     ap_scoreboard_image->parent
 #endif