diff options
| -rw-r--r-- | Modules/regexpr.c | 13 | ||||
| -rw-r--r-- | Parser/acceler.c | 7 |
2 files changed, 15 insertions, 5 deletions
diff --git a/Modules/regexpr.c b/Modules/regexpr.c index ccf515a..d5c0c85 100644 --- a/Modules/regexpr.c +++ b/Modules/regexpr.c @@ -37,10 +37,16 @@ $Header$ #include <stdlib.h> #include <string.h> #else +#ifdef __STDC__ +/* Don't mess around, use the standard headers */ +#include <stdlib.h> +#include <string.h> +#else char *malloc(); void free(); char *realloc(); -#endif +#endif /* __STDC__ */ +#endif /* THINK_C */ #define MACRO_BEGIN do { #define MACRO_END } while (0) @@ -508,6 +514,7 @@ regexp_t bufp; goto normal_char; opcode = Ceol; goto store_opcode; + /* NOTREACHED */ break; case Roptional: if (beginning_context) @@ -1504,6 +1511,8 @@ regexp_registers_t regs; startpos, range, regs, size); } +#ifdef UNUSED + static struct re_pattern_buffer re_comp_buf; char *re_comp(s) @@ -1532,6 +1541,8 @@ char *s; return re_search(&re_comp_buf, s, len, 0, len, (regexp_registers_t)NULL) >= 0; } +#endif + #ifdef TEST_REGEXP int main() diff --git a/Parser/acceler.c b/Parser/acceler.c index 53fa12e..3a17e0e 100644 --- a/Parser/acceler.c +++ b/Parser/acceler.c @@ -40,7 +40,7 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. /* Forward references */ static void fixdfa PROTO((grammar *, dfa *)); -static void fixstate PROTO((grammar *, dfa *, state *)); +static void fixstate PROTO((grammar *, state *)); void addaccelerators(g) @@ -69,13 +69,12 @@ fixdfa(g, d) int j; s = d->d_state; for (j = 0; j < d->d_nstates; j++, s++) - fixstate(g, d, s); + fixstate(g, s); } static void -fixstate(g, d, s) +fixstate(g, s) grammar *g; - dfa *d; state *s; { arc *a; |