Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1 | From b6a59b05f1fa514c6b387c9544bd63b1bfcf2eed Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Wed, 13 Jan 2016 05:38:29 +0000 |
| 4 | Subject: [PATCH] Cover the else with __GLIBC__ |
| 5 | |
| 6 | Fixes build errors on musl/x86 |
| 7 | |
| 8 | | In file included from |
| 9 | /home/ubuntu/work/oe/openembedded-core/build/tmp-musl/sysroots/qemux86/usr/include/asm/termios.h:1:0, |
| 10 | | from |
| 11 | /home/ubuntu/work/oe/openembedded-core/build/tmp-musl/sysroots/qemux86/usr/include/linux/termios.h:5, |
| 12 | | from |
| 13 | /home/ubuntu/work/oe/openembedded-core/build/tmp-musl/work/i586-oe-linux-musl/console-tools/0.3.2-r8/console-tools-0.3.2/vttools/resizecons.c:86: |
| 14 | | |
| 15 | /home/ubuntu/work/oe/openembedded-core/build/tmp-musl/sysroots/qemux86/usr/include/asm-generic/termios.h:14:8: |
| 16 | error: redefinition of 'struct winsize' |
| 17 | | struct winsize { |
| 18 | | ^ |
| 19 | | In file included from |
| 20 | /home/ubuntu/work/oe/openembedded-core/build/tmp-musl/sysroots/qemux86/usr/include/sys/ioctl.h:7:0, |
| 21 | | from |
| 22 | /home/ubuntu/work/oe/openembedded-core/build/tmp-musl/work/i586-oe-linux-musl/console-tools/0.3.2-r8/console-tools-0.3.2/vttools/resizecons.c:81: |
| 23 | | |
| 24 | /home/ubuntu/work/oe/openembedded-core/build/tmp-musl/sysroots/qemux86/usr/include/bits/ioctl.h:90:8: |
| 25 | note: originally defined here |
| 26 | | struct winsize { |
| 27 | | ^ |
| 28 | |
| 29 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 30 | --- |
| 31 | Upstream-Status: Pending |
| 32 | |
| 33 | vttools/resizecons.c | 2 +- |
| 34 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 35 | |
| 36 | diff --git a/vttools/resizecons.c b/vttools/resizecons.c |
| 37 | index f0a7055..e8753b1 100644 |
| 38 | --- a/vttools/resizecons.c |
| 39 | +++ b/vttools/resizecons.c |
| 40 | @@ -81,7 +81,7 @@ |
| 41 | #include <sys/ioctl.h> |
| 42 | #if (__GNU_LIBRARY__ >= 6) |
| 43 | # include <sys/perm.h> |
| 44 | -#else |
| 45 | +#elif defined __GLIBC__ |
| 46 | # include <linux/types.h> |
| 47 | # include <linux/termios.h> |
| 48 | #endif |
| 49 | -- |
| 50 | 2.7.0 |
| 51 | |