Re: regexec.c does not build

[Jakub Jelinek <jakub at redhat dot com>]

On Sat, Jan 03, 2004 at 10:37:08AM +0100, Andreas Jaeger wrote:
> 
> Uli, did you forget to commit a patch?
> 
> In file included from regex.c:54:
> regexec.c: In function `re_search_internal':
> regexec.c:572: error: unknown field `dfa' specified in initializer
> regexec.c:572: warning: missing braces around initializer
> regexec.c:572: warning: (near initialization for `mctx.input')
> regexec.c:572: warning: initialization from incompatible pointer type
> regexec.c: In function `prune_impossible_nodes':
> regexec.c:846: error: structure has no member named `dfa'
> regexec.c: In function `acquire_init_state_context':
> regexec.c:936: error: structure has no member named `dfa'
> regexec.c: In function `check_matching':
> regexec.c:977: error: structure has no member named `dfa'
> regexec.c: In function `check_halt_state_context':
> regexec.c:1103: error: structure has no member named `dfa'
> regexec.c: In function `proceed_next_node':
> regexec.c:1121: error: structure has no member named `dfa'
> regexec.c: In function `sift_states_backward':
> regexec.c:1442: error: structure has no member named `dfa'
> regexec.c: In function `update_cur_sifted_state':
> regexec.c:1608: error: structure has no member named `dfa'
> regexec.c: In function `check_dst_limits':

Seems the regex_internal.h part of the patch has not been commited.
Also, perl -pi -e 's/mctxt/mctx/' ChangeLog
(sorry for not providing ChangeLog entry yesterday).

--- libc/posix/regex_internal.h.jj	2004-01-03 13:44:41.000000000 +0100
+++ libc/posix/regex_internal.h	2004-01-03 13:45:04.000000000 +0100
@@ -556,6 +556,11 @@ typedef struct
 {
   /* The string object corresponding to the input string.  */
   re_string_t input;
+#if defined _LIBC || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L)
+  re_dfa_t *const dfa;
+#else
+  re_dfa_t *dfa;
+#endif
   /* EFLAGS of the argument of regexec.  */
   int eflags;
   /* Where the matching ends.  */


	Jakub