httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c...@hyperreal.org
Subject cvs commit: apache-1.3/src/regex Makefile.tmpl debug.c main.c regcomp.c regerror.c regexec.c regfree.c regex.h
Date Wed, 04 Feb 1998 18:18:57 GMT
coar        98/02/04 10:18:57

  Modified:    src      Configure
               src/include conf.h
               src/regex Makefile.tmpl debug.c main.c regcomp.c regerror.c
                        regexec.c regfree.c
  Removed:     src/include regex.h
               src/regex regex.h
  Log:
  	Insulate our HS regex package from confusion with any system-supplied
  	one by renaming the header file to "hsregex.h".  The old regex.h
  	file has been cvs rm'ed from src/regex and src/include.
  
  Revision  Changes    Path
  1.183     +1 -0      apache-1.3/src/Configure
  
  Index: Configure
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/Configure,v
  retrieving revision 1.182
  retrieving revision 1.183
  diff -u -r1.182 -r1.183
  --- Configure	1998/02/04 10:27:42	1.182
  +++ Configure	1998/02/04 18:18:49	1.183
  @@ -906,6 +906,7 @@
   if [ "$RULE_WANTHSREGEX" = "yes" ]; then
       REGLIB="regex/libregex.a"
       SUBDIRS="$SUBDIRS regex"
  +    CFLAGS="$CFLAGS -DUSE_HSREGEX"
   fi
   
   # create modules.c
  
  
  
  1.178     +3 -1      apache-1.3/src/include/conf.h
  
  Index: conf.h
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/include/conf.h,v
  retrieving revision 1.177
  retrieving revision 1.178
  diff -u -r1.177 -r1.178
  --- conf.h	1998/01/25 01:40:56	1.177
  +++ conf.h	1998/02/04 18:18:51	1.178
  @@ -868,7 +868,9 @@
   #endif
   
   #ifdef WIN32
  -#include "../regex/regex.h"
  +#include "../include/hsregex.h"
  +#elif defined(USE_HSREGEX)
  +#include "hsregex.h"
   #else
   #include <regex.h>
   #endif
  
  
  
  1.4       +3 -3      apache-1.3/src/regex/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/regex/Makefile.tmpl,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Makefile.tmpl	1998/02/01 16:33:12	1.3
  +++ Makefile.tmpl	1998/02/04 18:18:52	1.4
  @@ -46,7 +46,7 @@
   	rm -f *.o
   
   # stuff to build regex.h
  -REGEXH=../include/regex.h
  +REGEXH=../include/hsregex.h
   REGEXHSRC=regex2.h $(REGSRC)
   $(REGEXH):	$(REGEXHSRC) mkh
   	sh ./mkh $(MKHFLAGS) -i _REGEX_H_ $(REGEXHSRC) > $(REGEXH)
  @@ -105,7 +105,7 @@
   
   
   mf.tmp:	Makefile
  -	sed '/^REGEXH=/s/=.*/=..\/include\\regex.h/' Makefile \
  +	sed '/^REGEXH=/s/=.*/=..\/include\\hsregex.h/' Makefile \
   	| sed '/#DEL$$/d' >$@
   
   DTRH=cclass.h cname.h regex2.h utils.h
  @@ -132,4 +132,4 @@
   
   # don't do this one unless you know what you're doing
   spotless:	clean
  -	rm -f mkh regex.h
  +	rm -f mkh ../include/hsregex.h
  
  
  
  1.3       +1 -1      apache-1.3/src/regex/debug.c
  
  Index: debug.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/regex/debug.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- debug.c	1997/02/17 04:52:40	1.2
  +++ debug.c	1998/02/04 18:18:53	1.3
  @@ -4,8 +4,8 @@
   #include <limits.h>
   #include <stdlib.h>
   #include <sys/types.h>
  -#include <regex.h>
   
  +#include "hsregex.h"
   #include "utils.h"
   #include "regex2.h"
   #include "debug.ih"
  
  
  
  1.3       +1 -1      apache-1.3/src/regex/main.c
  
  Index: main.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/regex/main.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- main.c	1997/02/17 04:52:40	1.2
  +++ main.c	1998/02/04 18:18:53	1.3
  @@ -1,10 +1,10 @@
   #include <stdio.h>
   #include <string.h>
   #include <sys/types.h>
  -#include <regex.h>
   #include <assert.h>
   #include <stdlib.h>
   
  +#include "hsregex.h"
   #include "main.ih"
   
   char *progname;
  
  
  
  1.5       +1 -1      apache-1.3/src/regex/regcomp.c
  
  Index: regcomp.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/regex/regcomp.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- regcomp.c	1997/07/16 00:41:24	1.4
  +++ regcomp.c	1998/02/04 18:18:53	1.5
  @@ -4,8 +4,8 @@
   #include <ctype.h>
   #include <limits.h>
   #include <stdlib.h>
  -#include <regex.h>
   
  +#include "hsregex.h"
   #include "utils.h"
   #include "regex2.h"
   
  
  
  
  1.4       +1 -1      apache-1.3/src/regex/regerror.c
  
  Index: regerror.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/regex/regerror.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- regerror.c	1997/07/16 00:41:24	1.3
  +++ regerror.c	1998/02/04 18:18:54	1.4
  @@ -4,8 +4,8 @@
   #include <ctype.h>
   #include <limits.h>
   #include <stdlib.h>
  -#include <regex.h>
   
  +#include "hsregex.h"
   #include "utils.h"
   #include "regerror.ih"
   
  
  
  
  1.5       +1 -1      apache-1.3/src/regex/regexec.c
  
  Index: regexec.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/regex/regexec.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- regexec.c	1997/07/16 00:41:25	1.4
  +++ regexec.c	1998/02/04 18:18:55	1.5
  @@ -11,8 +11,8 @@
   #include <string.h>
   #include <limits.h>
   #include <ctype.h>
  -#include <regex.h>
   
  +#include "hsregex.h"
   #include "utils.h"
   #include "regex2.h"
   
  
  
  
  1.3       +1 -1      apache-1.3/src/regex/regfree.c
  
  Index: regfree.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/regex/regfree.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- regfree.c	1997/07/16 00:41:26	1.2
  +++ regfree.c	1998/02/04 18:18:55	1.3
  @@ -1,8 +1,8 @@
   #include <sys/types.h>
   #include <stdio.h>
   #include <stdlib.h>
  -#include <regex.h>
   
  +#include "hsregex.h"
   #include "utils.h"
   #include "regex2.h"
   
  
  
  

Mime
View raw message