From: Paul Eggert Date: Thu, 19 Jun 2014 15:22:20 +0000 (-0700) Subject: regex: merge patch from libc X-Git-Tag: v1.0~7349 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=657762608e6e00e2b2a428ca1ebdf309c990ec2e;p=gnulib.git regex: merge patch from libc 2014-02-12 Joseph Myers Combine __USE_BSD and __USE_SVID into __USE_MISC. * lib/regex.h [__USE_BSD]: Change condition to [__USE_MISC]. --- diff --git a/ChangeLog b/ChangeLog index 818ff806e4..687a79d7b2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2014-06-19 Paul Eggert + + regex: merge patch from libc + 2014-02-12 Joseph Myers + Combine __USE_BSD and __USE_SVID into __USE_MISC. + * lib/regex.h [__USE_BSD]: Change condition to [__USE_MISC]. + 2014-06-17 Paul Eggert acl: port to gcc -Wredundant-decls diff --git a/lib/regex.h b/lib/regex.h index 54327c69e3..45ac1a0da6 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 *);