Reported by Aharon Robbins in <http://sourceware.org/ml/libc-alpha/2012-12/msg00456.html>. * lib/regex_internal.h (__wctype, __iswctype) [!_LIBC]: #undef before defining. --- ChangeLog | 6 ++++++ lib/regex_internal.h | 2 ++ 2 files changed, 8 insertions(+)
diff --git a/ChangeLog b/ChangeLog index 71ae04d..0824b08 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2012-12-29 Paul Eggert <egg...@cs.ucla.edu> + regex: avoid redefining __wctype + Reported by Aharon Robbins in + <http://sourceware.org/ml/libc-alpha/2012-12/msg00456.html>. + * lib/regex_internal.h (__wctype, __iswctype) [!_LIBC]: + #undef before defining. + regex: port to hosts where malloc (0) == NULL Reported by Aharon Robbins in <http://sourceware.org/ml/libc-alpha/2012-12/msg00456.html>. diff --git a/lib/regex_internal.h b/lib/regex_internal.h index 9c746f5..0f6d398 100644 --- a/lib/regex_internal.h +++ b/lib/regex_internal.h @@ -100,6 +100,8 @@ /* Rename to standard API for using out of glibc. */ #ifndef _LIBC +# undef __wctype +# undef __iswctype # define __wctype wctype # define __iswctype iswctype # define __btowc btowc -- 1.7.11.7