-rw-r--r-- | scripts/kconfig/expr.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/kconfig/expr.h b/scripts/kconfig/expr.h index fd9c32a..896a296 100644 --- a/scripts/kconfig/expr.h +++ b/scripts/kconfig/expr.h | |||
@@ -145,54 +145,57 @@ struct property { | |||
145 | struct expr *dep; | 145 | struct expr *dep; |
146 | struct expr *dep2; | 146 | struct expr *dep2; |
147 | struct menu *menu; | 147 | struct menu *menu; |
148 | struct file *file; | 148 | struct file *file; |
149 | int lineno; | 149 | int lineno; |
150 | #ifdef CML1 | 150 | #ifdef CML1 |
151 | struct property *next_pos; | 151 | struct property *next_pos; |
152 | #endif | 152 | #endif |
153 | }; | 153 | }; |
154 | 154 | ||
155 | #define for_all_properties(sym, st, tok) \ | 155 | #define for_all_properties(sym, st, tok) \ |
156 | for (st = sym->prop; st; st = st->next) \ | 156 | for (st = sym->prop; st; st = st->next) \ |
157 | if (st->type == (tok)) | 157 | if (st->type == (tok)) |
158 | #define for_all_prompts(sym, st) for_all_properties(sym, st, P_PROMPT) | 158 | #define for_all_prompts(sym, st) for_all_properties(sym, st, P_PROMPT) |
159 | #define for_all_defaults(sym, st) for_all_properties(sym, st, P_DEFAULT) | 159 | #define for_all_defaults(sym, st) for_all_properties(sym, st, P_DEFAULT) |
160 | #define for_all_choices(sym, st) for_all_properties(sym, st, P_CHOICE) | 160 | #define for_all_choices(sym, st) for_all_properties(sym, st, P_CHOICE) |
161 | 161 | ||
162 | struct menu { | 162 | struct menu { |
163 | struct menu *next; | 163 | struct menu *next; |
164 | struct menu *parent; | 164 | struct menu *parent; |
165 | struct menu *list; | 165 | struct menu *list; |
166 | struct symbol *sym; | 166 | struct symbol *sym; |
167 | struct property *prompt; | 167 | struct property *prompt; |
168 | struct expr *dep; | 168 | struct expr *dep; |
169 | unsigned int flags; | ||
169 | //char *help; | 170 | //char *help; |
170 | struct file *file; | 171 | struct file *file; |
171 | int lineno; | 172 | int lineno; |
172 | //void *data; | 173 | void *data; |
173 | }; | 174 | }; |
174 | 175 | ||
176 | #define MENU_CHANGED 0x0001 | ||
177 | |||
175 | #ifndef SWIG | 178 | #ifndef SWIG |
176 | 179 | ||
177 | extern struct file *file_list; | 180 | extern struct file *file_list; |
178 | extern struct file *current_file; | 181 | extern struct file *current_file; |
179 | struct file *lookup_file(const char *name); | 182 | struct file *lookup_file(const char *name); |
180 | 183 | ||
181 | extern struct symbol symbol_yes, symbol_no, symbol_mod; | 184 | extern struct symbol symbol_yes, symbol_no, symbol_mod; |
182 | extern struct symbol *modules_sym; | 185 | extern struct symbol *modules_sym; |
183 | extern int cdebug; | 186 | extern int cdebug; |
184 | extern int print_type; | 187 | extern int print_type; |
185 | struct expr *expr_alloc_symbol(struct symbol *sym); | 188 | struct expr *expr_alloc_symbol(struct symbol *sym); |
186 | #ifdef CML1 | 189 | #ifdef CML1 |
187 | struct expr *expr_alloc_one(int token, struct expr *ce); | 190 | struct expr *expr_alloc_one(int token, struct expr *ce); |
188 | struct expr *expr_alloc_two(int token, struct expr *e1, struct expr *e2); | 191 | struct expr *expr_alloc_two(int token, struct expr *e1, struct expr *e2); |
189 | struct expr *expr_alloc_comp(int token, struct symbol *s1, struct symbol *s2); | 192 | struct expr *expr_alloc_comp(int token, struct symbol *s1, struct symbol *s2); |
190 | #else | 193 | #else |
191 | struct expr *expr_alloc_one(enum expr_type type, struct expr *ce); | 194 | struct expr *expr_alloc_one(enum expr_type type, struct expr *ce); |
192 | struct expr *expr_alloc_two(enum expr_type type, struct expr *e1, struct expr *e2); | 195 | struct expr *expr_alloc_two(enum expr_type type, struct expr *e1, struct expr *e2); |
193 | struct expr *expr_alloc_comp(enum expr_type type, struct symbol *s1, struct symbol *s2); | 196 | struct expr *expr_alloc_comp(enum expr_type type, struct symbol *s1, struct symbol *s2); |
194 | #endif | 197 | #endif |
195 | struct expr *expr_alloc_and(struct expr *e1, struct expr *e2); | 198 | struct expr *expr_alloc_and(struct expr *e1, struct expr *e2); |
196 | struct expr *expr_copy(struct expr *org); | 199 | struct expr *expr_copy(struct expr *org); |
197 | void expr_free(struct expr *e); | 200 | void expr_free(struct expr *e); |
198 | int expr_eq(struct expr *e1, struct expr *e2); | 201 | int expr_eq(struct expr *e1, struct expr *e2); |