1.1 --- a/kconfig/lkc.h Sun Apr 15 16:45:11 2007 +0000
1.2 +++ b/kconfig/lkc.h Sat Mar 07 11:05:37 2009 +0000
1.3 @@ -11,9 +11,9 @@
1.4 #ifndef KBUILD_NO_NLS
1.5 # include <libintl.h>
1.6 #else
1.7 -# define gettext(Msgid) ((const char *) (Msgid))
1.8 -# define textdomain(Domainname) ((const char *) (Domainname))
1.9 -# define bindtextdomain(Domainname, Dirname) ((const char *) (Dirname))
1.10 +static inline const char *gettext(const char *txt) { return txt; }
1.11 +static inline void textdomain(const char *domainname) {}
1.12 +static inline void bindtextdomain(const char *name, const char *dir) {}
1.13 #endif
1.14
1.15 #ifdef __cplusplus
1.16 @@ -31,7 +31,6 @@
1.17
1.18 #define SRCTREE "srctree"
1.19
1.20 -#define PROJECT_NAME "crosstool-NG"
1.21 #define PACKAGE "crosstool-NG"
1.22 #define LOCALEDIR "/usr/share/locale"
1.23
1.24 @@ -43,8 +42,17 @@
1.25 #define TF_PARAM 0x0002
1.26 #define TF_OPTION 0x0004
1.27
1.28 +enum conf_def_mode {
1.29 + def_default,
1.30 + def_yes,
1.31 + def_mod,
1.32 + def_no,
1.33 + def_random
1.34 +};
1.35 +
1.36 #define T_OPT_MODULES 1
1.37 #define T_OPT_DEFCONFIG_LIST 2
1.38 +#define T_OPT_ENV 3
1.39
1.40 struct kconf_id {
1.41 int name;
1.42 @@ -65,15 +73,18 @@
1.43 char *zconf_curname(void);
1.44
1.45 /* confdata.c */
1.46 +const char *conf_get_configname(void);
1.47 char *conf_get_default_confname(void);
1.48 void sym_set_change_count(int count);
1.49 void sym_add_change_count(int count);
1.50 +void conf_set_all_new_symbols(enum conf_def_mode mode);
1.51
1.52 /* kconfig_load.c */
1.53 void kconfig_load(void);
1.54
1.55 /* menu.c */
1.56 void menu_init(void);
1.57 +void menu_warn(struct menu *menu, const char *fmt, ...);
1.58 struct menu *menu_add_menu(void);
1.59 void menu_end_menu(void);
1.60 void menu_add_entry(struct symbol *sym);
1.61 @@ -103,6 +114,8 @@
1.62 const char *str_get(struct gstr *gs);
1.63
1.64 /* symbol.c */
1.65 +extern struct expr *sym_env_list;
1.66 +
1.67 void sym_init(void);
1.68 void sym_clear_all_valid(void);
1.69 void sym_set_all_changed(void);
1.70 @@ -110,6 +123,7 @@
1.71 struct symbol *sym_check_deps(struct symbol *sym);
1.72 struct property *prop_alloc(enum prop_type type, struct symbol *sym);
1.73 struct symbol *prop_get_symbol(struct property *prop);
1.74 +struct property *sym_get_env_prop(struct symbol *sym);
1.75
1.76 static inline tristate sym_get_tristate_value(struct symbol *sym)
1.77 {