浏览代码

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

Mike Frysinger 20 年之前
父节点
当前提交
da163069d8
共有 4 个文件被更改,包括 4 次插入4 次删除
  1. 0 3
      package/config/lkc.h
  2. 0 1
      package/config/menu.c
  3. 2 0
      package/config/zconf.tab.c_shipped
  4. 2 0
      package/config/zconf.y

+ 0 - 3
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);

+ 0 - 1
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;

+ 2 - 0
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
 
 

+ 2 - 0
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