diff options
author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2018-03-15 02:25:27 -0400 |
---|---|---|
committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2018-03-25 13:04:06 -0400 |
commit | 26561514cc9defed09a043dfaedc900274b76ff2 (patch) | |
tree | 5db7bc47345c5823639cce054119eaebb03f443d | |
parent | f8f69dc0b4e070d4a4d39889a85424913cc922d5 (diff) |
kconfig: do not include both curses.h and ncurses.h for nconfig
nconf.h includes <curses.h> and "ncurses.h", but it does not need to
include both. Generally, it should fall back to curses.h only when
ncurses.h is not found. But, looks like it has never happened;
these includes have been here for many years since commit 692d97c380c6
("kconfig: new configuration interface (nconfig)"), and nobody has
complained about hard-coding of ncurses.h . Let's simply drop the
curses.h inclusion.
I replaced "ncurses.h" with <ncurses.h> since it is not a local file.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
-rw-r--r-- | scripts/kconfig/nconf.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/scripts/kconfig/nconf.h b/scripts/kconfig/nconf.h index 0d5261705ef5..9f6f21d3b0d4 100644 --- a/scripts/kconfig/nconf.h +++ b/scripts/kconfig/nconf.h | |||
@@ -15,7 +15,7 @@ | |||
15 | #include <string.h> | 15 | #include <string.h> |
16 | #include <unistd.h> | 16 | #include <unistd.h> |
17 | #include <locale.h> | 17 | #include <locale.h> |
18 | #include <curses.h> | 18 | #include <ncurses.h> |
19 | #include <menu.h> | 19 | #include <menu.h> |
20 | #include <panel.h> | 20 | #include <panel.h> |
21 | #include <form.h> | 21 | #include <form.h> |
@@ -24,8 +24,6 @@ | |||
24 | #include <time.h> | 24 | #include <time.h> |
25 | #include <sys/time.h> | 25 | #include <sys/time.h> |
26 | 26 | ||
27 | #include "ncurses.h" | ||
28 | |||
29 | #define max(a, b) ({\ | 27 | #define max(a, b) ({\ |
30 | typeof(a) _a = a;\ | 28 | typeof(a) _a = a;\ |
31 | typeof(b) _b = b;\ | 29 | typeof(b) _b = b;\ |