diff options
| author | Roman Zippel <zippel@linux-m68k.org> | 2004-09-13 19:33:17 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-09-13 19:33:17 -0700 |
| commit | c794e99c91d095ad07349222ff7a6be1c52d9153 (patch) | |
| tree | 84791e64e3c153f036284d7b5fe58143c4e77e92 | |
| parent | 3c3f504a6d82cfaf7a82c613c8d8bac6c21b083d (diff) | |
| download | history-c794e99c91d095ad07349222ff7a6be1c52d9153.tar.gz | |
[PATCH] properly fix double current_menu
The two current_menu variables are really two separate variables, so keep
them separate.
Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | scripts/kconfig/lkc.h | 3 | ||||
| -rw-r--r-- | scripts/kconfig/mconf.c | 2 | ||||
| -rw-r--r-- | scripts/kconfig/menu.c | 1 | ||||
| -rw-r--r-- | scripts/kconfig/zconf.y | 2 |
4 files changed, 3 insertions, 5 deletions
diff --git a/scripts/kconfig/lkc.h b/scripts/kconfig/lkc.h index dd040f7a86276d..e348ee7d86a54d 100644 --- a/scripts/kconfig/lkc.h +++ b/scripts/kconfig/lkc.h @@ -59,9 +59,6 @@ void menu_set_type(int type); struct file *file_lookup(const char *name); int file_write_dep(const char *name); -extern struct menu *current_entry; -extern struct menu *current_menu; - /* symbol.c */ void sym_init(void); void sym_clear_all_valid(void); diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c index 070213e2f04c69..91789cc9d2af30 100644 --- a/scripts/kconfig/mconf.c +++ b/scripts/kconfig/mconf.c @@ -89,7 +89,7 @@ static char *args[1024], **argptr = args; static int indent; static struct termios ios_org; static int rows = 0, cols = 0; -struct menu *current_menu; +static struct menu *current_menu; static int child_count; static int do_resize; static int single_menu_mode; diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c index 38046c606bfc36..7b26f982bad59f 100644 --- a/scripts/kconfig/menu.c +++ b/scripts/kconfig/menu.c @@ -10,7 +10,6 @@ #include "lkc.h" struct menu rootmenu; -struct menu *current_menu, *current_entry; static struct menu **last_entry_ptr; struct file *file_list; diff --git a/scripts/kconfig/zconf.y b/scripts/kconfig/zconf.y index 459b69011af75d..aad1f51147656a 100644 --- a/scripts/kconfig/zconf.y +++ b/scripts/kconfig/zconf.y @@ -25,6 +25,8 @@ static bool zconf_endtoken(int token, int starttoken, int endtoken); struct symbol *symbol_hash[257]; +static struct menu *current_menu, *current_entry; + #define YYERROR_VERBOSE %} %expect 40 |