[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 4/6] regex: avoid redefining __wctype
From: |
Paul Eggert |
Subject: |
[PATCH 4/6] regex: avoid redefining __wctype |
Date: |
Sun, 30 Dec 2012 00:16:31 -0800 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/17.0 Thunderbird/17.0 |
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 <address@hidden>
+ 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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [PATCH 4/6] regex: avoid redefining __wctype,
Paul Eggert <=