From: Mike Frysinger <vapier@gentoo.org>
Date: Thu, 28 Jul 2005 22:27:27 +0000 (-0000)
Subject: grab some static updates from linux-2.6 git to fix gcc4 build errors as reported... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=da163069d81bf2e47b49e8349076e7ff33dfe7e0;p=buildroot.git

grab some static updates from linux-2.6 git to fix gcc4 build errors as reported by Khem Raj
---

diff --git a/package/config/lkc.h b/package/config/lkc.h
index dd040f7a86..e348ee7d86 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 6425296fc3..7f100a643b 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 83dbf9ed57..b4fc1a9010 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 f354c89e6c..896cdb6176 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