diff options
| author | Paul Eggert <eggert@twinsun.com> | 1994-10-26 22:43:45 +0000 |
|---|---|---|
| committer | Paul Eggert <eggert@twinsun.com> | 1994-10-26 22:43:45 +0000 |
| commit | 273c0c509d72da33ba08af0fded4b1952c033cea (patch) | |
| tree | 5cbc3ae8c9990e061178c94652b09f22d4114676 | |
| parent | 83d8b97d936755588b8fb00134baea8b301c9500 (diff) | |
| download | emacs-273c0c509d72da33ba08af0fded4b1952c033cea.tar.gz emacs-273c0c509d72da33ba08af0fded4b1952c033cea.tar.bz2 emacs-273c0c509d72da33ba08af0fded4b1952c033cea.zip | |
(re_comp, re_exec): Define this obsolete 4.2bsd
interface only if the new feature test macro _REGEX_RE_COMP is defined.
This avoids a clash with Cray YMP include files.
| -rw-r--r-- | src/regex.c | 6 | ||||
| -rw-r--r-- | src/regex.h | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/regex.c b/src/regex.c index c7674a1e9c3..33c7ea242cd 100644 --- a/src/regex.c +++ b/src/regex.c @@ -4934,9 +4934,9 @@ re_compile_pattern (pattern, length, bufp) } /* Entry points compatible with 4.2 BSD regex library. We don't define - them if this is an Emacs or POSIX compilation. */ + them unless specifically requested. */ -#if !defined (emacs) && !defined (_POSIX_SOURCE) +#ifdef _REGEX_RE_COMP /* BSD has one and only one pattern buffer. */ static struct re_pattern_buffer re_comp_buf; @@ -4987,7 +4987,7 @@ re_exec (s) return 0 <= re_search (&re_comp_buf, s, len, 0, len, (struct re_registers *) 0); } -#endif /* not emacs and not _POSIX_SOURCE */ +#endif /* _REGEX_RE_COMP */ /* POSIX.2 functions. Don't define these for Emacs. */ diff --git a/src/regex.h b/src/regex.h index 40f684cb8e5..55927f627c9 100644 --- a/src/regex.h +++ b/src/regex.h @@ -460,9 +460,11 @@ extern void re_set_registers _RE_ARGS ((struct re_pattern_buffer *buffer, struct re_registers *regs, unsigned num_regs, regoff_t *starts, regoff_t *ends)); +#ifdef _REGEX_RE_COMP /* 4.2 bsd compatibility. */ extern char *re_comp _RE_ARGS ((const char *)); extern int re_exec _RE_ARGS ((const char *)); +#endif /* POSIX compatibility. */ extern int regcomp _RE_ARGS ((regex_t *preg, const char *pattern, int cflags)); |