From 65493aa2cc289360154a4c437d3ed41e60a99fb6 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 29 Dec 2012 23:00:48 -0800 Subject: [PATCH] regex: avoid redefining __wctype Reported by Aharon Robbins in . * 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 71ae04df7..0824b0835 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 --git a/lib/regex_internal.h b/lib/regex_internal.h index 9c746f5e9..0f6d398c2 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 -- 2.11.0