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 | 6681af04338786de19eca39afc7bfd467195f775 (patch) | |
tree | 2235ab0979297a6f57639c87b5928e234594fb2e /src/regex.c | |
parent | b9abad3699541c9636729f882187da64a128ce5c (diff) | |
download | emacs-6681af04338786de19eca39afc7bfd467195f775.tar.gz |
(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.
Diffstat (limited to 'src/regex.c')
-rw-r--r-- | src/regex.c | 6 |
1 files changed, 3 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. */ |