httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@hyperreal.org
Subject cvs commit: apache-2.0/mpm/src/main Makefile.tmpl http_main.c http_request.c
Date Thu, 24 Jun 1999 17:48:32 GMT
jim         99/06/24 10:48:31

  Modified:    mpm/src/main Makefile.tmpl http_main.c http_request.c
  Log:
  Allow for prefork to compile on systems
  that don't have pthreads installed
  
  Revision  Changes    Path
  1.8       +1 -2      apache-2.0/mpm/src/main/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /export/home/cvs/apache-2.0/mpm/src/main/Makefile.tmpl,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Makefile.tmpl	1999/06/24 08:58:56	1.7
  +++ Makefile.tmpl	1999/06/24 17:48:24	1.8
  @@ -133,8 +133,7 @@
    $(INCDIR)/apr.h $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
    $(INCDIR)/http_request.h $(INCDIR)/http_core.h \
    $(INCDIR)/http_protocol.h $(INCDIR)/http_log.h \
  - $(INCDIR)/http_main.h $(INCDIR)/scoreboard.h /usr/include/pthread.h \
  - $(INCDIR)/fnmatch.h
  + $(INCDIR)/http_main.h $(INCDIR)/fnmatch.h
   http_vhost.o: http_vhost.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
    $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
    $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
  
  
  
  1.2       +1 -0      apache-2.0/mpm/src/main/http_main.c
  
  Index: http_main.c
  ===================================================================
  RCS file: /export/home/cvs/apache-2.0/mpm/src/main/http_main.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- http_main.c	1999/06/18 18:39:30	1.1
  +++ http_main.c	1999/06/24 17:48:26	1.2
  @@ -244,6 +244,7 @@
       pool *plog;			/* Pool for error-logging files */
       pool *ptemp;		/* Pool for temporart config stuff */
       pool *pcommands;		/* Pool for -C and -c switches */
  +    extern char *optarg;
   
   
       /* TODO: PATHSEPARATOR should be one of the os defines */
  
  
  
  1.5       +2 -0      apache-2.0/mpm/src/main/http_request.c
  
  Index: http_request.c
  ===================================================================
  RCS file: /export/home/cvs/apache-2.0/mpm/src/main/http_request.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- http_request.c	1999/06/20 12:27:10	1.4
  +++ http_request.c	1999/06/24 17:48:27	1.5
  @@ -73,7 +73,9 @@
   #include "http_protocol.h"
   #include "http_log.h"
   #include "http_main.h"
  +#if 0
   #include "scoreboard.h"
  +#endif
   #include "fnmatch.h"
   
   /*****************************************************************
  
  
  

Mime
View raw message