From: Brian Havard <bjh@apache.org>
Date: Tue, 6 Feb 2001 23:33:31 +0000 (+0000)
Subject: Don't include mpm.h from scoreboard.h as scoreboard.h is included from mpm.h.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3b9cb01fae67d0f16334f03e55f9cb613369626b;p=apache

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 cbb67dd147..a6cbd33ca3 100644
--- 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 c1f61456d1..921b197f95 100644
--- 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 0d597c73be..4e58e8fdc1 100644
--- 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"