Commit da163069 authored by Mike Frysinger's avatar Mike Frysinger
Browse files

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

parent dbd27ef3

package/config/lkc.h

+0 −3
Original line number Diff line number Diff line
@@ -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);

package/config/menu.c

+0 −1
Original line number Diff line number Diff line
@@ -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;

package/config/zconf.tab.c_shipped

+2 −0
Original line number Diff line number Diff line
@@ -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

package/config/zconf.y

+2 −0
Original line number Diff line number Diff line
@@ -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