From 9ea8ded37b648bbd538cbf9c4d144b8b1a93c1b5 Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Thu, 19 Jan 2017 17:27:37 -0200 Subject: build-sys: fix compilation with ncurses and uClibc or musl libc Compiling util-linux with musl and uClibc-ng toolchains when wide-char support is not enabled in ncurses results in compilation failures with the following message: error: two or more data types in declaration specifiers #define wchar_t char The problem occurs because util-linux #defines its own wchar_t (as char) when configured without widechar support. This conflicts with definition of wchar_t contained in stddef.h. This error can be reproduced running " #define wchar_t char #include int main() { return 0; } The only way to avoid the problem it to reorder the inclusion of headers in some files under the text-utils directory. Addresses: http://autobuild.buildroot.net/results/3a2f228e0fa7b5cc28a13d49f48f1a6aef8d9d7a http://autobuild.buildroot.net/results/99e96069f652d511c6212a5bb6be29e68fb1747c http://autobuild.buildroot.net/results/2dc5721aef93b7b410153bafad78248fac3db941 http://autobuild.buildroot.net/results/8a9e197ba7a292b18f8c0c36dca974685556a38a Signed-off-by: Carlos Santos --- text-utils/column.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'text-utils/column.c') diff --git a/text-utils/column.c b/text-utils/column.c index 43b3af5f5..2eb47a3ea 100644 --- a/text-utils/column.c +++ b/text-utils/column.c @@ -50,8 +50,8 @@ #include #include "nls.h" -#include "widechar.h" #include "c.h" +#include "widechar.h" #include "xalloc.h" #include "strutils.h" #include "closestream.h" -- cgit v1.2.3-55-g7522