Mercurial > hg > octave-kai > gnulib-hg
changeset 537:9b0e58b976fb
[SYNTAX]: Rename from SYNTAX_TABLE.
[SYNTAX_TABLE]: Remove extern dcl or re_syntax_table.
(RE_SEARCH_2_FN): Cast string1 and string2 to avoid pointer type
mismatch errors from e.g. SunOS's /bin/cc.
Reported by Kaveh Ghazi.
author | Jim Meyering <jim@meyering.net> |
---|---|
date | Fri, 05 Jan 1996 02:35:39 +0000 |
parents | 4f90813976b1 |
children | b3f9e2eb8633 |
files | lib/rx.c |
diffstat | 1 files changed, 5 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/lib/rx.c +++ b/lib/rx.c @@ -118,9 +118,7 @@ #ifndef emacs -#ifdef SYNTAX_TABLE -extern char *re_syntax_table; -#else /* not SYNTAX_TABLE */ +#ifndef SYNTAX RX_DECL char re_syntax_table[CHAR_SET_SIZE]; @@ -153,7 +151,7 @@ done = 1; } -#endif /* not SYNTAX_TABLE */ +#endif /* not SYNTAX */ #endif /* not emacs */ /* Compile with `-DRX_DEBUG' and use the following flags. @@ -4969,7 +4967,7 @@ */ rxb->re_nsub = 0; -#if !defined (emacs) && !defined (SYNTAX_TABLE) +#if !defined (emacs) && !defined (SYNTAX) /* Initialize the syntax table. */ init_syntax_once (); #endif @@ -6437,9 +6435,9 @@ { int answer; struct re_search_2_closure closure; - closure.string1 = string1; + closure.string1 = (__const__ unsigned char *) string1; closure.size1 = size1; - closure.string2 = string2; + closure.string2 = (__const__ unsigned char *) string2; closure.size2 = size2; answer = rx_search (rxb, startpos, range, stop, size1 + size2, re_search_2_get_burst,