diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2014-06-12 12:04:01 +0100 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2014-06-12 12:04:01 +0100 |
| commit | c5c1033c5c7deda8abe3448ec81bbb33c72219e0 (patch) | |
| tree | 6e5cef29b85161eea8a7488a029f5a32f982c6ab /term-utils/setterm.c | |
| parent | 462008f79be9e195670b202cb43827b8aeb1e60b (diff) | |
| parent | 2fb567c080e1762ec6a2147564f03068f55d4f14 (diff) | |
| download | util-linux-baserock/morph.tar.gz | |
Merge branch 'baserock/richardmaw/yakshave/util-linux-blkid' into baserock/morphbaserock/morph
Reviewed-by: Lars Wirzenius
Reviewed-by: Sam Thursfield
Diffstat (limited to 'term-utils/setterm.c')
| -rw-r--r-- | term-utils/setterm.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/term-utils/setterm.c b/term-utils/setterm.c index 310c3fab0..f179ea8ac 100644 --- a/term-utils/setterm.c +++ b/term-utils/setterm.c @@ -100,16 +100,17 @@ #include <termios.h> #include <string.h> #include <fcntl.h> + #ifndef NCURSES_CONST #define NCURSES_CONST const /* define before including term.h */ #endif -#include <term.h> - #ifdef HAVE_NCURSES_H #include <ncurses.h> #elif defined(HAVE_NCURSES_NCURSES_H) #include <ncurses/ncurses.h> #endif +/* must include after ncurses.h */ +#include <term.h> #include <sys/param.h> /* for MAXPATHLEN */ #include <sys/ioctl.h> @@ -123,7 +124,7 @@ #include "nls.h" #include "closestream.h" -#if __GNU_LIBRARY__ < 5 +#if defined(__GNU_LIBRARY__) && __GNU_LIBRARY__ < 5 #ifndef __alpha__ # include <linux/unistd.h> #define __NR_klogctl __NR_syslog |