[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
- [PATCH] OS/2 patches, KO Myung-Hun, 2015/05/27
- [PATCH 01/12] stdint: check _INTPTR_T_DECLARED before defining intptr_t and uintptr_t, KO Myung-Hun, 2015/05/27
- [PATCH 02/12] binary-io: don't put fd in binary mode if it is a console on EMX, KO Myung-Hun, 2015/05/27
- [PATCH 03/12] pipe-filter-aux: undefine HAVE_SELECT on KLIBC, KO Myung-Hun, 2015/05/27
- [PATCH 05/12] wcwidth: fix 'conflicting types' error for `__wcwidth' on OS/2 kLIBC,
KO Myung-Hun <=
- [PATCH 04/12] w32spawn: clear SHELL_SPECIAL_CHARS and SHELL_SPACE_CHAR on OS/2 kLIBC, KO Myung-Hun, 2015/05/27
- [PATCH 06/12] gnulib-tool: fall back into copy if symbolic link is not supported, KO Myung-Hun, 2015/05/27
- Re: [PATCH 06/12] gnulib-tool: fall back into copy if symbolic link is not supported, Paul Eggert, 2015/05/27
[PATCH 07/12] pipe_filter_ii_execute: port to OS/2 kLIBC, KO Myung-Hun, 2015/05/27