Commit 3b9cb01f authored by Brian Havard's avatar Brian Havard
Browse files

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
parent cff3c2b0

include/scoreboard.h

+0 −1
Original line number Diff line number Diff line
@@ -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"

server/mpm/spmt_os2/mpm.h

+4 −4
Original line number Diff line number Diff line
@@ -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;

server/mpm/spmt_os2/spmt_os2.c

+1 −1
Original line number Diff line number Diff line
@@ -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"