[PATCH 16/21] wcwidth: fix 'conflicting types' error for `__wcwidth' on OS/2 kLIBC

[KO Myung-Hun]

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

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

diff --git a/lib/wcwidth.c b/lib/wcwidth.c
index d7837bb..b36abd5 100644
--- a/lib/wcwidth.c
+++ b/lib/wcwidth.c
@@ -26,6 +26,15 @@
 #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
+/* Ignore wcwidth() of OS/2 kLIBC */
+# undef HAVE_WCWIDTH
+#endif
+
 int
 wcwidth (wchar_t wc)
 #undef wcwidth
-- 
1.8.5.2