# HG changeset patch # User Paul Eggert # Date 1356850848 28800 # Node ID d7e0ca139637d45bebaa8b103d64ddf64f53ef28 # Parent e101c2620c25443e6400189578e6ce48b751ea30 regex: avoid redefining __wctype Reported by Aharon Robbins in . * lib/regex_internal.h (__wctype, __iswctype) [!_LIBC]: #undef before defining. diff -r e101c2620c25 -r d7e0ca139637 ChangeLog --- 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 + regex: avoid redefining __wctype + Reported by Aharon Robbins in + . + * lib/regex_internal.h (__wctype, __iswctype) [!_LIBC]: + #undef before defining. + regex: port to hosts where malloc (0) == NULL Reported by Aharon Robbins in . diff -r e101c2620c25 -r d7e0ca139637 lib/regex_internal.h --- 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