Mercurial > hg > octave-nkf > gnulib-hg
changeset 17709:e76613a60b02
regex: merge patch from libc
2014-02-12 Joseph Myers <joseph@codesourcery.com>
Combine __USE_BSD and __USE_SVID into __USE_MISC.
* lib/regex.h [__USE_BSD]: Change condition to [__USE_MISC].
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Thu, 19 Jun 2014 08:22:20 -0700 |
| parents | 994f65de77de |
| children | fe5bf4d5ee95 |
| files | ChangeLog lib/regex.h |
| diffstat | 2 files changed, 8 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2014-06-19 Paul Eggert <eggert@penguin.cs.ucla.edu> + + regex: merge patch from libc + 2014-02-12 Joseph Myers <joseph@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 <eggert@cs.ucla.edu> acl: port to gcc -Wredundant-decls
--- a/lib/regex.h +++ b/lib/regex.h @@ -608,7 +608,7 @@ 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 *);