| Message ID | 1521095127-23067-1-git-send-email-yamada.masahiro@socionext.com |
|---|---|
| State | Accepted |
| Commit | 26561514cc9defed09a043dfaedc900274b76ff2 |
| Headers | show |
| Series | kconfig: do not include both curses.h and ncurses.h for nconfig | expand |
2018-03-15 15:25 GMT+09:00 Masahiro Yamada <yamada.masahiro@socionext.com>: > 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 does not exist in > the local directory. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> > --- > Applied to linux-kbuild/kconfig. -- Best Regards Masahiro Yamada
diff --git a/scripts/kconfig/nconf.h b/scripts/kconfig/nconf.h index 0d52617..9f6f21d 100644 --- a/scripts/kconfig/nconf.h +++ b/scripts/kconfig/nconf.h @@ -15,7 +15,7 @@ #include <string.h> #include <unistd.h> #include <locale.h> -#include <curses.h> +#include <ncurses.h> #include <menu.h> #include <panel.h> #include <form.h> @@ -24,8 +24,6 @@ #include <time.h> #include <sys/time.h> -#include "ncurses.h" - #define max(a, b) ({\ typeof(a) _a = a;\ typeof(b) _b = b;\
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 does not exist in the local directory. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- scripts/kconfig/nconf.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -- 2.7.4