2014-02-12 Joseph Myers <jos...@codesourcery.com>
Combine __USE_BSD and __USE_SVID into __USE_MISC.
* lib/regex.h [__USE_BSD]: Change condition to [__USE_MISC].
---
ChangeLog | 7 +++++++
lib/regex.h | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index 818ff80..687a79d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2014-06-19 Paul Eggert <egg...@penguin.cs.ucla.edu>
+
+ regex: merge patch from libc
+ 2014-02-12 Joseph Myers <jos...@codesourcery.com>
+ Combine __USE_BSD and __USE_SVID into __USE_MISC.
+ * lib/regex.h [__USE_BSD]: Change condition to [__USE_MISC].
+
2014-06-17 Paul Eggert <egg...@cs.ucla.edu>
acl: port to gcc -Wredundant-decls
diff --git a/lib/regex.h b/lib/regex.h
index 54327c6..45ac1a0 100644
--- a/lib/regex.h
+++ b/lib/regex.h
@@ -608,7 +608,7 @@ extern void re_set_registers (struct re_pattern_buffer
*__buffer,
regoff_t *__starts, regoff_t *__ends);
#endif /* Use GNU */
-#if defined _REGEX_RE_COMP || (defined _LIBC && defined __USE_BSD)
+#if defined _REGEX_RE_COMP || (defined _LIBC && defined __USE_MISC)
# ifndef _CRAY
/* 4.2 bsd compatibility. */
extern char *re_comp (const char *);
--
1.9.3
