httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b..@apache.org
Subject cvs commit: httpd-2.0/server/mpm/spmt_os2 mpm.h spmt_os2.c
Date Tue, 06 Feb 2001 23:33:33 GMT
bjh         01/02/06 15:33:33

  Modified:    include  scoreboard.h
               server/mpm/spmt_os2 mpm.h spmt_os2.c
  Log:
  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.
  
  Revision  Changes    Path
  1.7       +0 -1      httpd-2.0/include/scoreboard.h
  
  Index: scoreboard.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/include/scoreboard.h,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- scoreboard.h	2001/02/06 22:22:55	1.6
  +++ scoreboard.h	2001/02/06 23:33:29	1.7
  @@ -70,7 +70,6 @@
   #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"
  
  
  
  1.6       +4 -4      httpd-2.0/server/mpm/spmt_os2/mpm.h
  
  Index: mpm.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/spmt_os2/mpm.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- mpm.h	2001/02/06 15:16:05	1.5
  +++ mpm.h	2001/02/06 23:33:31	1.6
  @@ -56,14 +56,14 @@
    * 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;
  
  
  
  1.77      +1 -1      httpd-2.0/server/mpm/spmt_os2/spmt_os2.c
  
  Index: spmt_os2.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/spmt_os2/spmt_os2.c,v
  retrieving revision 1.76
  retrieving revision 1.77
  diff -u -r1.76 -r1.77
  --- spmt_os2.c	2001/02/06 15:16:05	1.76
  +++ spmt_os2.c	2001/02/06 23:33:31	1.77
  @@ -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"
  
  
  

Mime
View raw message