diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2011-02-02 14:59:18 +0100 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2011-02-02 15:54:50 +0100 |
| commit | a72ab0542ff1dd8909ba5f1065627e41e3316b45 (patch) | |
| tree | 0b6fe75709ffe7dbf821ed2b7ac038f8cd49510c /package/config/expr.h | |
| parent | a538d4057e3add76889270ec097572223b11ba07 (diff) | |
package/config: rebase against 2.6.38-rc3
Fixes nconfig crash on comments within choice groups.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/config/expr.h')
| -rw-r--r-- | package/config/expr.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/package/config/expr.h b/package/config/expr.h index e57826ced..3d238db49 100644 --- a/package/config/expr.h +++ b/package/config/expr.h @@ -192,7 +192,7 @@ struct expr *expr_alloc_two(enum expr_type type, struct expr *e1, struct expr *e struct expr *expr_alloc_comp(enum expr_type type, struct symbol *s1, struct symbol *s2); struct expr *expr_alloc_and(struct expr *e1, struct expr *e2); struct expr *expr_alloc_or(struct expr *e1, struct expr *e2); -struct expr *expr_copy(struct expr *org); +struct expr *expr_copy(const struct expr *org); void expr_free(struct expr *e); int expr_eq(struct expr *e1, struct expr *e2); void expr_eliminate_eq(struct expr **ep1, struct expr **ep2); @@ -207,6 +207,7 @@ struct expr *expr_extract_eq_and(struct expr **ep1, struct expr **ep2); struct expr *expr_extract_eq_or(struct expr **ep1, struct expr **ep2); void expr_extract_eq(enum expr_type type, struct expr **ep, struct expr **ep1, struct expr **ep2); struct expr *expr_trans_compare(struct expr *e, enum expr_type type, struct symbol *sym); +struct expr *expr_simplify_unmet_dep(struct expr *e1, struct expr *e2); void expr_fprint(struct expr *e, FILE *out); struct gstr; /* forward */ |