bug-gnulib
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH 05/12] wcwidth: fix 'conflicting types' error for `__wcwidth' on


From: KO Myung-Hun
Subject: [PATCH 05/12] wcwidth: fix 'conflicting types' error for `__wcwidth' on OS/2 kLIBC
Date: Wed, 27 May 2015 21:45:43 +0900

wchar_t(unsigned short) is defined differently from wint_t(int) on
OS/2 kLIBC.

* lib/wcwidth.c (wcwidth): Undefine on OS/2 kLIBC.
---
 lib/wcwidth.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lib/wcwidth.c b/lib/wcwidth.c
index d2b7118..e398f30 100644
--- a/lib/wcwidth.c
+++ b/lib/wcwidth.c
@@ -26,6 +26,13 @@
 #include "streq.h"
 #include "uniwidth.h"
 
+#ifdef __KLIBC__
+/* To avoid 'conflicting types' error for `__wcwidth' on OS/2 kLIBC.
+   wchar_t(unsigned short) is defined differently from wint_t(int) on
+   OS/2 kLIBC. */
+# undef wcwidth
+#endif
+
 int
 wcwidth (wchar_t wc)
 #undef wcwidth
-- 
1.9.5




reply via email to

[Prev in Thread] Current Thread [Next in Thread]