diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2010-09-02 17:08:11 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2010-09-02 17:08:11 +0200 |
| commit | e62ed84b19d114870daf1f16aae177f60f9d6ad3 (patch) | |
| tree | 9b3471d639525410bd65e36c5e5aa94b77c29a28 /package/config/expr.h | |
| parent | 9bc12b85e83266c83f1fee0b9dd2d38e43d9252c (diff) | |
| parent | 40177240fab04c710fd756a24816b451b37dc1b8 (diff) | |
Merge branch 'for-2010.11/kconfig-upgrade' of git://git.busybox.net/~tpetazzoni/git/buildroot
Diffstat (limited to 'package/config/expr.h')
| -rw-r--r-- | package/config/expr.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/package/config/expr.h b/package/config/expr.h index 6408fefae..6ee2e4fb1 100644 --- a/package/config/expr.h +++ b/package/config/expr.h @@ -83,10 +83,11 @@ struct symbol { tristate visible; int flags; struct property *prop; + struct expr_value dir_dep; struct expr_value rev_dep; }; -#define for_all_symbols(i, sym) for (i = 0; i < 257; i++) for (sym = symbol_hash[i]; sym; sym = sym->next) if (sym->type != S_OTHER) +#define for_all_symbols(i, sym) for (i = 0; i < SYMBOL_HASHSIZE; i++) for (sym = symbol_hash[i]; sym; sym = sym->next) if (sym->type != S_OTHER) #define SYMBOL_CONST 0x0001 /* symbol is const */ #define SYMBOL_CHECK 0x0008 /* used during dependency checking */ @@ -108,8 +109,7 @@ struct symbol { #define SYMBOL_DEF4 0x80000 /* symbol.def[S_DEF_4] is valid */ #define SYMBOL_MAXLENGTH 256 -#define SYMBOL_HASHSIZE 257 -#define SYMBOL_HASHMASK 0xff +#define SYMBOL_HASHSIZE 9973 /* A property represent the config options that can be associated * with a config "symbol". @@ -132,6 +132,7 @@ enum prop_type { P_SELECT, /* select BAR */ P_RANGE, /* range 7..100 (for a symbol) */ P_ENV, /* value from environment variable */ + P_SYMBOL, /* where a symbol is defined */ }; struct property { @@ -164,6 +165,7 @@ struct menu { struct symbol *sym; struct property *prompt; struct expr *dep; + struct expr *dir_dep; unsigned int flags; char *help; struct file *file; |