From: Jim Meyering <jim@meyering.net>
Date: Sun, 30 Oct 1994 05:28:15 +0000 (+0000)
Subject: merge with 1.9.1i
X-Git-Tag: textutils-1_12_1~493
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2654c2012b97aa5de9d902bbc9105e02c6c95044;p=thirdparty%2Fcoreutils.git

merge with 1.9.1i
---

diff --git a/lib/regex.c b/lib/regex.c
index 7598572fe2..c239e2fd10 100644
--- a/lib/regex.c
+++ b/lib/regex.c
@@ -4938,9 +4938,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;
@@ -4991,7 +4991,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.  */