changeset 17379:c357d97f690f

wctype-h: fix gettext link error on mingw Reported by Josue Andrade Gomes and Takayuki Tsunakawa in <https://lists.gnu.org/archive/html/bug-gettext/2013-03/msg00086.html>. * lib/wctype.in.h [__MINGW32__]: Include <ctype.h> before defining rpl_towupper and rpl_towupper.
author Daiki Ueno <ueno@gnu.org>
date Thu, 25 Apr 2013 13:32:03 -0700
parents ee311a5bfb19
children 2278c530e565
files ChangeLog lib/wctype.in.h
diffstat 2 files changed, 15 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2013-04-25  Daiki Ueno  <ueno@gnu.org>
+
+	wctype-h: fix gettext link error on mingw
+	Reported by Josue Andrade Gomes and Takayuki Tsunakawa in
+	<https://lists.gnu.org/archive/html/bug-gettext/2013-03/msg00086.html>.
+	* lib/wctype.in.h [__MINGW32__]: Include <ctype.h> before defining
+	rpl_towupper and rpl_towupper.
+
 2013-04-11  Dmitry V. Levin  <ldv@altlinux.org>
 
 	regex-tests, regex: allow glibc re_search behavior
--- a/lib/wctype.in.h
+++ b/lib/wctype.in.h
@@ -44,6 +44,13 @@
 # include <wchar.h>
 #endif
 
+/* mingw has declarations of towupper and towlower in <ctype.h> as
+   well <wctype.h>.  Include <ctype.h> in advance to avoid rpl_ prefix
+   being added to the declarations.  */
+#ifdef __MINGW32__
+# include <ctype.h>
+#endif
+
 /* Include the original <wctype.h> if it exists.
    BeOS 5 has the functions but no <wctype.h>.  */
 /* The include_next requires a split double-inclusion guard.  */