[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 06/13] wcwidth: fix 'conflicting types' error for `__wcwidth'
From: |
KO Myung-Hun |
Subject: |
[PATCH v3 06/13] wcwidth: fix 'conflicting types' error for `__wcwidth' on OS/2 kLIBC |
Date: |
Mon, 19 Jan 2015 13:47:12 +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.8.5.2
- [PATCH v3] OS/2 patches, KO Myung-Hun, 2015/01/18
- [PATCH v3 05/13] getdtablesize: do not use getrlimit() on OS/2 kLIBC, KO Myung-Hun, 2015/01/18
- [PATCH v3 06/13] wcwidth: fix 'conflicting types' error for `__wcwidth' on OS/2 kLIBC,
KO Myung-Hun <=
- [PATCH v3 02/13] binary-io: don't put fd in binary mode if it is a console on EMX, KO Myung-Hun, 2015/01/18
- [PATCH v3 01/13] stdint: check _INTPTR_T_DECLARED before defining intptr_t and uintptr_t, KO Myung-Hun, 2015/01/18
- [PATCH v3 03/13] pipe-filter-aux: undefine HAVE_SELECT on KLIBC, KO Myung-Hun, 2015/01/18
- [PATCH v3 04/13] w32spawn: clear SHELL_SPECIAL_CHARS and SHELL_SPACE_CHAR on OS/2 kLIBC, KO Myung-Hun, 2015/01/18
- [PATCH v3 08/13] pipe_filter_ii_execute: port to OS/2 kLIBC, KO Myung-Hun, 2015/01/18
- [PATCH v3 07/13] gnulib-tool: fall back into copy if symbolic link is not supported, KO Myung-Hun, 2015/01/18
- [PATCH v3 09/13] dup, dup2, fcntl: support a directory fd on OS/2 kLIBC, KO Myung-Hun, 2015/01/18
- [PATCH v3 11/13] configmake: prepend /@unixroot on OS/2 kLIBC, KO Myung-Hun, 2015/01/18
- [PATCH v3 13/13] openat_proc_name: port to OS/2 kLIBC, KO Myung-Hun, 2015/01/18
- [PATCH v3 12/13] utimes: detect utimes() correctly on OS/2 kLIBC, KO Myung-Hun, 2015/01/18