Mercurial > gnulib
changeset 17236:d7e0ca139637
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.
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Sat, 29 Dec 2012 23:00:48 -0800 |
| parents | e101c2620c25 |
| children | 899138bc3a58 |
| files | ChangeLog lib/regex_internal.h |
| diffstat | 2 files changed, 8 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat Dec 29 22:56:31 2012 -0800 +++ b/ChangeLog Sat Dec 29 23:00:48 2012 -0800 @@ -1,5 +1,11 @@ 2012-12-29 Paul Eggert <eggert@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>.
--- a/lib/regex_internal.h Sat Dec 29 22:56:31 2012 -0800 +++ b/lib/regex_internal.h Sat Dec 29 23:00:48 2012 -0800 @@ -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