Mercurial > hg > octave-kai > gnulib-hg
changeset 337:897c373a78e8
(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.
author | Paul Eggert <eggert@cs.ucla.edu> |
---|---|
date | Wed, 26 Oct 1994 22:43:45 +0000 |
parents | 6bd3c2692fcb |
children | 815155102500 |
files | regex.c regex.h |
diffstat | 2 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/regex.c +++ b/regex.c @@ -4934,9 +4934,9 @@ } /* Entry points compatible with 4.2 BSD regex library. We don't define - them if this is an Emacs or POSIX compilation. */ - -#if !defined (emacs) && !defined (_POSIX_SOURCE) + them unless specifically requested. */ + +#ifdef _REGEX_RE_COMP /* BSD has one and only one pattern buffer. */ static struct re_pattern_buffer re_comp_buf; @@ -4987,7 +4987,7 @@ 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. */
--- a/regex.h +++ b/regex.h @@ -460,9 +460,11 @@ _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));