httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@hyperreal.org
Subject cvs commit: apache-2.0/mpm/src/modules/mpm/prefork Makefile.tmpl prefork.c
Date Tue, 13 Jul 1999 20:32:51 GMT
manoj       99/07/13 13:32:51

  Modified:    mpm/src/modules/mpm/mpmt_pthread Makefile.tmpl
               mpm/src/modules/mpm/prefork Makefile.tmpl prefork.c
  Removed:     mpm/src/include scoreboard.h scoreboard_prefork.h
  Log:
  Move the scoreboard header files for each MPM into the appropriate MPM
  subdirectories:
  
      src/include/scoreboard.h -> src/modules/mpm/mpmt_pthread/scoreboard.h
      src/include/scoreboard_prefork.h -> src/modules/mpm/prefork/scoreboard.h
  
  Revision  Changes    Path
  1.5       +2 -2      apache-2.0/mpm/src/modules/mpm/mpmt_pthread/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /home/cvs/apache-2.0/mpm/src/modules/mpm/mpmt_pthread/Makefile.tmpl,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -d -u -r1.4 -r1.5
  --- Makefile.tmpl	1999/07/09 20:40:19	1.4
  +++ Makefile.tmpl	1999/07/13 20:32:49	1.5
  @@ -81,7 +81,7 @@
    $(INCDIR)/ap_hooks.h $(INCDIR)/http_core.h \
    $(INCDIR)/http_connection.h $(INCDIR)/ap_mpm.h \
    $(OSDIR)/unixd.h $(OSDIR)/iol_socket.h \
  - $(INCDIR)/ap_listen.h $(INCDIR)/scoreboard.h \
  + $(INCDIR)/ap_listen.h scoreboard.h \
    acceptlock.h ../../../lib/expat-lite/xmlparse.h
   scoreboard.o: scoreboard.c $(INCDIR)/httpd.h \
    $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
  @@ -94,4 +94,4 @@
    $(INCDIR)/http_main.h $(INCDIR)/http_core.h \
    $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
    $(OSDIR)/unixd.h $(INCDIR)/http_conf_globals.h \
  - mpmt_pthread.h $(INCDIR)/scoreboard.h
  + mpmt_pthread.h scoreboard.h
  
  
  
  1.6       +1 -1      apache-2.0/mpm/src/modules/mpm/prefork/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /home/cvs/apache-2.0/mpm/src/modules/mpm/prefork/Makefile.tmpl,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -d -u -r1.5 -r1.6
  --- Makefile.tmpl	1999/07/06 21:32:14	1.5
  +++ Makefile.tmpl	1999/07/13 20:32:50	1.6
  @@ -65,6 +65,6 @@
    $(INCDIR)/http_main.h $(INCDIR)/http_log.h \
    $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
    $(INCDIR)/http_core.h $(INCDIR)/http_connection.h \
  - $(INCDIR)/scoreboard_prefork.h $(INCDIR)/ap_mpm.h \
  + scoreboard.h $(INCDIR)/ap_mpm.h \
    $(OSDIR)/unixd.h $(OSDIR)/iol_socket.h \
    $(INCDIR)/ap_listen.h
  
  
  
  1.11      +1 -1      apache-2.0/mpm/src/modules/mpm/prefork/prefork.c
  
  Index: prefork.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/mpm/src/modules/mpm/prefork/prefork.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -d -u -r1.10 -r1.11
  --- prefork.c	1999/07/11 19:00:50	1.10
  +++ prefork.c	1999/07/13 20:32:50	1.11
  @@ -93,7 +93,7 @@
   #include "http_config.h"
   #include "http_core.h"		/* for get_remote_host */
   #include "http_connection.h"
  -#include "scoreboard_prefork.h"
  +#include "scoreboard.h"
   #include "ap_mpm.h"
   #include "unixd.h"
   #include "iol_socket.h"
  
  
  

Mime
View raw message