diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2005-07-28 22:27:27 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-07-28 22:27:27 +0000 |
| commit | da163069d81bf2e47b49e8349076e7ff33dfe7e0 (patch) | |
| tree | 000ebdbe4fd1edc23b73d4b1c93808eb760cd3c3 | |
| parent | dbd27ef3acd817853ce10cf38ca1eb80004c4c04 (diff) | |
grab some static updates from linux-2.6 git to fix gcc4 build errors as reported by Khem Raj
| -rw-r--r-- | package/config/lkc.h | 3 | ||||
| -rw-r--r-- | package/config/menu.c | 1 | ||||
| -rw-r--r-- | package/config/zconf.tab.c_shipped | 2 | ||||
| -rw-r--r-- | package/config/zconf.y | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/package/config/lkc.h b/package/config/lkc.h index dd040f7a8..e348ee7d8 100644 --- a/package/config/lkc.h +++ b/package/config/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/package/config/menu.c b/package/config/menu.c index 6425296fc..7f100a643 100644 --- a/package/config/menu.c +++ b/package/config/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/package/config/zconf.tab.c_shipped b/package/config/zconf.tab.c_shipped index 83dbf9ed5..b4fc1a901 100644 --- a/package/config/zconf.tab.c_shipped +++ b/package/config/zconf.tab.c_shipped @@ -175,6 +175,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 diff --git a/package/config/zconf.y b/package/config/zconf.y index f354c89e6..896cdb617 100644 --- a/package/config/zconf.y +++ b/package/config/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 |