You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by br...@hyperreal.org on 1998/07/08 20:47:15 UTC
cvs commit: apache-1.3/src/regex engine.c regcomp.c
brian 98/07/08 11:47:14
Modified: src/regex engine.c regcomp.c
Log:
I'm assuming this is the right place to do this, though on reflection
maybe /include/hsregex.h would be better, I'm not sure. This fixes it
for now.
Revision Changes Path
1.4 +1 -0 apache-1.3/src/regex/engine.c
Index: engine.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/regex/engine.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- engine.c 1998/07/08 17:47:26 1.3
+++ engine.c 1998/07/08 18:47:13 1.4
@@ -46,6 +46,7 @@
};
#include "engine.ih"
+#include "apctype.h"
#ifdef REDEBUG
#define SP(t, s, c) print(m, t, s, c, stdout)
1.7 +1 -0 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- regcomp.c 1998/07/08 17:47:27 1.6
+++ regcomp.c 1998/07/08 18:47:13 1.7
@@ -6,6 +6,7 @@
#include <stdlib.h>
#include "hsregex.h"
+#include "apctype.h"
#include "utils.h"
#include "regex2.h"
Re: cvs commit: apache-1.3/src/regex engine.c regcomp.c
Posted by Alexei Kosut <ak...@leland.Stanford.EDU>.
On Wed, 8 Jul 1998, Brian Behlendorf wrote:
> I'm not making this up, Dean. :) Right there in regex/Makefile.tmpl we have:
>
> $(REGEXH): $(REGEXHSRC) mkh
> sh ./mkh $(MKHFLAGS) -i _REGEX_H_ $(REGEXHSRC) > $(REGEXH)
>
> Set your WANTHSREGEX to be true in your "Configuration" program, run
> ./Configure, and compile.
True. Although depending on your last-modified times, it might not end up
being built (we removed it from regex/make clean and added it to the CVS
tree).
BTW, anything placed in regex2.h, a la the WIN32 stuff, will end up in
hsregex.h when it's constructed by mkh.
-- Alexei Kosut <ak...@stanford.edu> <http://www.stanford.edu/~akosut/>
Stanford University, Class of 2001 * Apache <http://www.apache.org> *
Re: cvs commit: apache-1.3/src/regex engine.c regcomp.c
Posted by Dean Gaudet <dg...@arctic.org>.
On Wed, 8 Jul 1998, Dean Gaudet wrote:
> Interesting. Well, then the __cplusplus changes to hsregex.h are equally
> meaningless and need to be redone correctly.
Er, I'm full of it, the __cplusplus thing was fine too.
Things should be right now.
Dean
Re: cvs commit: apache-1.3/src/regex engine.c regcomp.c
Posted by Dean Gaudet <dg...@arctic.org>.
Interesting. Well, then the __cplusplus changes to hsregex.h are equally
meaningless and need to be redone correctly.
I thought Alexei disabled this stuff ages ago.
I'll fix it properly now.
Dean
On Wed, 8 Jul 1998, Brian Behlendorf wrote:
>
> I'm not making this up, Dean. :) Right there in regex/Makefile.tmpl we have:
>
> $(REGEXH): $(REGEXHSRC) mkh
> sh ./mkh $(MKHFLAGS) -i _REGEX_H_ $(REGEXHSRC) > $(REGEXH)
>
> Set your WANTHSREGEX to be true in your "Configuration" program, run
> ./Configure, and compile.
>
> Brian
>
> At 03:59 PM 7/8/98 -0700, Dean Gaudet wrote:
> >We don't ever autogenerate hsregex.h any longer, because we can't generate
> >it on win32.
> >
> >On Wed, 8 Jul 1998, Brian Behlendorf wrote:
> >
> >> Wait a minute - include/hsregex.h is a generated file. From regex's
> >> Makefile as generated by Configure:
> >>
> >> sh ./mkh -i _REGEX_H_ regex2.h regcomp.c regerror.c regexec.c regfree.c >
> >> ../include/hsregex.h
> >>
> >> So where do we have to add the reference to apctype.h?
>
> --=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--
> pure chewing satisfaction brian@apache.org
> brian@hyperreal.org
>
Re: cvs commit: apache-1.3/src/regex engine.c regcomp.c
Posted by Brian Behlendorf <br...@hyperreal.org>.
I'm not making this up, Dean. :) Right there in regex/Makefile.tmpl we have:
$(REGEXH): $(REGEXHSRC) mkh
sh ./mkh $(MKHFLAGS) -i _REGEX_H_ $(REGEXHSRC) > $(REGEXH)
Set your WANTHSREGEX to be true in your "Configuration" program, run
./Configure, and compile.
Brian
At 03:59 PM 7/8/98 -0700, Dean Gaudet wrote:
>We don't ever autogenerate hsregex.h any longer, because we can't generate
>it on win32.
>
>On Wed, 8 Jul 1998, Brian Behlendorf wrote:
>
>> Wait a minute - include/hsregex.h is a generated file. From regex's
>> Makefile as generated by Configure:
>>
>> sh ./mkh -i _REGEX_H_ regex2.h regcomp.c regerror.c regexec.c regfree.c >
>> ../include/hsregex.h
>>
>> So where do we have to add the reference to apctype.h?
--=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--
pure chewing satisfaction brian@apache.org
brian@hyperreal.org
Re: cvs commit: apache-1.3/src/regex engine.c regcomp.c
Posted by Dean Gaudet <dg...@arctic.org>.
We don't ever autogenerate hsregex.h any longer, because we can't generate
it on win32.
Dean
On Wed, 8 Jul 1998, Brian Behlendorf wrote:
>
> Wait a minute - include/hsregex.h is a generated file. From regex's
> Makefile as generated by Configure:
>
> sh ./mkh -i _REGEX_H_ regex2.h regcomp.c regerror.c regexec.c regfree.c >
> ../include/hsregex.h
>
> So where do we have to add the reference to apctype.h?
>
> Brian
>
> At 02:56 PM 7/8/98 -0700, Dean Gaudet wrote:
> >It's already in hsregex.h, or at least it was when I committed it. Both
> >of these should be completely unnecessary. Why did you add them?
>
>
> --=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--
> pure chewing satisfaction brian@apache.org
> brian@hyperreal.org
>
Re: cvs commit: apache-1.3/src/regex engine.c regcomp.c
Posted by Brian Behlendorf <br...@hyperreal.org>.
Wait a minute - include/hsregex.h is a generated file. From regex's
Makefile as generated by Configure:
sh ./mkh -i _REGEX_H_ regex2.h regcomp.c regerror.c regexec.c regfree.c >
../include/hsregex.h
So where do we have to add the reference to apctype.h?
Brian
At 02:56 PM 7/8/98 -0700, Dean Gaudet wrote:
>It's already in hsregex.h, or at least it was when I committed it. Both
>of these should be completely unnecessary. Why did you add them?
--=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--
pure chewing satisfaction brian@apache.org
brian@hyperreal.org
Re: cvs commit: apache-1.3/src/regex engine.c regcomp.c
Posted by Brian Behlendorf <br...@hyperreal.org>.
Wait a minute - include/hsregex.h is a generated file. From regex's
Makefile as generated by Configure:
sh ./mkh -i _REGEX_H_ regex2.h regcomp.c regerror.c regexec.c regfree.c >
../include/hsregex.h
So where do we have to add the reference to apctype.h?
Brian
At 02:56 PM 7/8/98 -0700, Dean Gaudet wrote:
>It's already in hsregex.h, or at least it was when I committed it. Both
>of these should be completely unnecessary. Why did you add them?
--=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--
pure chewing satisfaction brian@apache.org
brian@hyperreal.org
Re: cvs commit: apache-1.3/src/regex engine.c regcomp.c
Posted by Dean Gaudet <dg...@arctic.org>.
It's already in hsregex.h, or at least it was when I committed it. Both
of these should be completely unnecessary. Why did you add them?
Dean
On 8 Jul 1998 brian@hyperreal.org wrote:
> brian 98/07/08 11:47:14
>
> Modified: src/regex engine.c regcomp.c
> Log:
> I'm assuming this is the right place to do this, though on reflection
> maybe /include/hsregex.h would be better, I'm not sure. This fixes it
> for now.
>
> Revision Changes Path
> 1.4 +1 -0 apache-1.3/src/regex/engine.c
>
> Index: engine.c
> ===================================================================
> RCS file: /export/home/cvs/apache-1.3/src/regex/engine.c,v
> retrieving revision 1.3
> retrieving revision 1.4
> diff -u -r1.3 -r1.4
> --- engine.c 1998/07/08 17:47:26 1.3
> +++ engine.c 1998/07/08 18:47:13 1.4
> @@ -46,6 +46,7 @@
> };
>
> #include "engine.ih"
> +#include "apctype.h"
>
> #ifdef REDEBUG
> #define SP(t, s, c) print(m, t, s, c, stdout)
>
>
>
> 1.7 +1 -0 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.6
> retrieving revision 1.7
> diff -u -r1.6 -r1.7
> --- regcomp.c 1998/07/08 17:47:27 1.6
> +++ regcomp.c 1998/07/08 18:47:13 1.7
> @@ -6,6 +6,7 @@
> #include <stdlib.h>
>
> #include "hsregex.h"
> +#include "apctype.h"
> #include "utils.h"
> #include "regex2.h"
>
>
>
>
>
Re: cvs commit: apache-1.3/src/regex engine.c regcomp.c
Posted by Dean Gaudet <dg...@arctic.org>.
It's already in hsregex.h, or at least it was when I committed it. Both
of these should be completely unnecessary. Why did you add them?
Dean
On 8 Jul 1998 brian@hyperreal.org wrote:
> brian 98/07/08 11:47:14
>
> Modified: src/regex engine.c regcomp.c
> Log:
> I'm assuming this is the right place to do this, though on reflection
> maybe /include/hsregex.h would be better, I'm not sure. This fixes it
> for now.
>
> Revision Changes Path
> 1.4 +1 -0 apache-1.3/src/regex/engine.c
>
> Index: engine.c
> ===================================================================
> RCS file: /export/home/cvs/apache-1.3/src/regex/engine.c,v
> retrieving revision 1.3
> retrieving revision 1.4
> diff -u -r1.3 -r1.4
> --- engine.c 1998/07/08 17:47:26 1.3
> +++ engine.c 1998/07/08 18:47:13 1.4
> @@ -46,6 +46,7 @@
> };
>
> #include "engine.ih"
> +#include "apctype.h"
>
> #ifdef REDEBUG
> #define SP(t, s, c) print(m, t, s, c, stdout)
>
>
>
> 1.7 +1 -0 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.6
> retrieving revision 1.7
> diff -u -r1.6 -r1.7
> --- regcomp.c 1998/07/08 17:47:27 1.6
> +++ regcomp.c 1998/07/08 18:47:13 1.7
> @@ -6,6 +6,7 @@
> #include <stdlib.h>
>
> #include "hsregex.h"
> +#include "apctype.h"
> #include "utils.h"
> #include "regex2.h"
>
>
>
>
>