aboutsummaryrefslogtreecommitdiffstats
path: root/src/regex.c
diff options
context:
space:
mode:
authorPaul Eggert1994-10-26 22:43:45 +0000
committerPaul Eggert1994-10-26 22:43:45 +0000
commit273c0c509d72da33ba08af0fded4b1952c033cea (patch)
tree5cbc3ae8c9990e061178c94652b09f22d4114676 /src/regex.c
parent83d8b97d936755588b8fb00134baea8b301c9500 (diff)
downloademacs-273c0c509d72da33ba08af0fded4b1952c033cea.tar.gz
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.
Diffstat (limited to 'src/regex.c')
-rw-r--r--src/regex.c6
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)
4934} 4934}
4935 4935
4936/* Entry points compatible with 4.2 BSD regex library. We don't define 4936/* Entry points compatible with 4.2 BSD regex library. We don't define
4937 them if this is an Emacs or POSIX compilation. */ 4937 them unless specifically requested. */
4938 4938
4939#if !defined (emacs) && !defined (_POSIX_SOURCE) 4939#ifdef _REGEX_RE_COMP
4940 4940
4941/* BSD has one and only one pattern buffer. */ 4941/* BSD has one and only one pattern buffer. */
4942static struct re_pattern_buffer re_comp_buf; 4942static struct re_pattern_buffer re_comp_buf;
@@ -4987,7 +4987,7 @@ re_exec (s)
4987 return 4987 return
4988 0 <= re_search (&re_comp_buf, s, len, 0, len, (struct re_registers *) 0); 4988 0 <= re_search (&re_comp_buf, s, len, 0, len, (struct re_registers *) 0);
4989} 4989}
4990#endif /* not emacs and not _POSIX_SOURCE */ 4990#endif /* _REGEX_RE_COMP */
4991 4991
4992/* POSIX.2 functions. Don't define these for Emacs. */ 4992/* POSIX.2 functions. Don't define these for Emacs. */
4993 4993