Don't include mpm.h from scoreboard.h as scoreboard.h is included from mpm.h.

Instead, make the MPM type defined before including scoreboard.h.
PR:
Obtained from:
Submitted by:
Reviewed by:

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

diff --git a/include/scoreboard.h b/include/scoreboard.h
index cbb67dd147feec239b0054c656c8e98c27e6b1d5..a6cbd33ca33485f88f4ac43d2d76e3685d400bfa 100644 (file)
--- a/include/scoreboard.h
+++ b/include/scoreboard.h
@@ -70,7 +70,6 @@ extern "C" {
 #include <time.h>
 #endif
 
-#include "mpm.h"               /* For MPM type */
 #include "mpm_default.h"       /* For HARD_.*_LIMIT */
 #include "apr_thread_proc.h"
 #include "apr_portable.h"

diff --git a/server/mpm/spmt_os2/mpm.h b/server/mpm/spmt_os2/mpm.h
index c1f61456d12728ed10023c2f62da362b1ac83c26..921b197f954f2bf246348ed0b0b6a5efe0f5cd1e 100644 (file)
--- a/server/mpm/spmt_os2/mpm.h
+++ b/server/mpm/spmt_os2/mpm.h
@@ -56,15 +56,15 @@
  * University of Illinois, Urbana-Champaign.
  */
 
-#include "httpd.h"
-#include "mpm_default.h"
-#include "scoreboard.h"
-
 #ifndef APACHE_MPM_SPMT_OS2_H
 #define APACHE_MPM_SPMT_OS2_H
 
 #define SPMT_OS2_MPM
 
+#include "httpd.h"
+#include "mpm_default.h"
+#include "scoreboard.h"
+
 extern char ap_coredump_dir[MAX_STRING_LEN];
 extern server_rec *ap_server_conf;
 extern int ap_threads_per_child;

diff --git a/server/mpm/spmt_os2/spmt_os2.c b/server/mpm/spmt_os2/spmt_os2.c
index 0d597c73bed347efd7adf87aa7f0a2c45733dabc..4e58e8fdc1ad491ab056bbcc3e91676692692174 100644 (file)
--- a/server/mpm/spmt_os2/spmt_os2.c
+++ b/server/mpm/spmt_os2/spmt_os2.c
@@ -68,7 +68,7 @@
 #include "http_config.h"
 #include "http_core.h"         /* for get_remote_host */
 #include "http_connection.h"
-#include "scoreboard.h"
+#include "mpm.h"
 #include "ap_mpm.h"
 #include "ap_listen.h"
 #include "apr_portable.h"