[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 08/14] wcwidth: fix 'conflicting types' error for `__wcwidth' on
From: |
KO Myung-Hun |
Subject: |
[PATCH 08/14] wcwidth: fix 'conflicting types' error for `__wcwidth' on OS/2 kLIBC |
Date: |
Tue, 9 Dec 2014 10:40:53 +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 d7837bb..2f8dc26 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
- Re: [PATCH 02/14] Fix character encoding aliases for OS/2, (continued)
[PATCH 04/14] binary-io: don't put fd in binary mode if it is a console on EMX, KO Myung-Hun, 2014/12/08
[PATCH 05/14] pipe-filter-aux: undefine HAVE_SELECT on KLIBC, KO Myung-Hun, 2014/12/08
[PATCH 06/14] w32spawn: clear SHELL_SPECIAL_CHARS and SHELL_SPACE_CHAR on OS/2 kLIBC, KO Myung-Hun, 2014/12/08
[PATCH 07/14] getdtablesize: do not use getrlimit() on OS/2 kLIBC, KO Myung-Hun, 2014/12/08
[PATCH 08/14] wcwidth: fix 'conflicting types' error for `__wcwidth' on OS/2 kLIBC,
KO Myung-Hun <=
[PATCH 09/14] utimes: detect utimes() correctly on OS/2 kLIBC, KO Myung-Hun, 2014/12/08
[PATCH 10/14] gnulib-tool: fall back into copy if symbolic link is not supported, KO Myung-Hun, 2014/12/08
[PATCH 11/14] pipe_filter_ii_execute: port to OS/2 kLIBC, KO Myung-Hun, 2014/12/08
[PATCH 12/14] save_cwd: save/restore all CWDs of each drive on EMX, KO Myung-Hun, 2014/12/08
[PATCH 13/14] dup, dup2, fcntl: support a directory fd on OS/2 kLIBC, KO Myung-Hun, 2014/12/08
[PATCH 14/14] opendir, closedir, dirfd, fdopendir: port to OS/2 kLIBC, KO Myung-Hun, 2014/12/08