projects
/
carl9170fw.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kconfig: Get rid of the P() macro in headers
[carl9170fw.git]
/
config
/
lkc.h
diff --git
a/config/lkc.h
b/config/lkc.h
index c18f2bd9c095510d1d5e58575b265bd67ae9e781..e418a30bbc40842e3ac7b6d54927eb1007d98d98 100644
(file)
--- a/
config/lkc.h
+++ b/
config/lkc.h
@@
-21,9
+21,7
@@
static inline char *bind_textdomain_codeset(const char *dn, char *c) { return c;
extern "C" {
#endif
extern "C" {
#endif
-#define P(name,type,arg) extern type name arg
#include "lkc_proto.h"
#include "lkc_proto.h"
-#undef P
#define SRCTREE "srctree"
#define SRCTREE "srctree"
@@
-39,6
+37,12
@@
extern "C" {
#ifndef CONFIG_
#define CONFIG_ "CONFIG_"
#endif
#ifndef CONFIG_
#define CONFIG_ "CONFIG_"
#endif
+static inline const char *CONFIG_prefix(void)
+{
+ return getenv( "CONFIG_" ) ?: CONFIG_;
+}
+#undef CONFIG_
+#define CONFIG_ CONFIG_prefix()
#define TF_COMMAND 0x0001
#define TF_PARAM 0x0002
#define TF_COMMAND 0x0001
#define TF_PARAM 0x0002
@@
-55,6
+59,7
@@
enum conf_def_mode {
#define T_OPT_MODULES 1
#define T_OPT_DEFCONFIG_LIST 2
#define T_OPT_ENV 3
#define T_OPT_MODULES 1
#define T_OPT_DEFCONFIG_LIST 2
#define T_OPT_ENV 3
+#define T_OPT_ALLNOCONFIG_Y 4
struct kconf_id {
int name;
struct kconf_id {
int name;
@@
-80,7
+85,8
@@
const char *conf_get_autoconfig_name(void);
char *conf_get_default_confname(void);
void sym_set_change_count(int count);
void sym_add_change_count(int count);
char *conf_get_default_confname(void);
void sym_set_change_count(int count);
void sym_add_change_count(int count);
-void conf_set_all_new_symbols(enum conf_def_mode mode);
+bool conf_set_all_new_symbols(enum conf_def_mode mode);
+void set_all_choice_values(struct symbol *csym);
struct conf_printer {
void (*print_symbol)(FILE *, struct symbol *, const char *, void *);
struct conf_printer {
void (*print_symbol)(FILE *, struct symbol *, const char *, void *);
@@
-116,6
+122,8
@@
void menu_set_type(int type);
/* util.c */
struct file *file_lookup(const char *name);
int file_write_dep(const char *name);
/* util.c */
struct file *file_lookup(const char *name);
int file_write_dep(const char *name);
+void *xmalloc(size_t size);
+void *xcalloc(size_t nmemb, size_t size);
struct gstr {
size_t len;
struct gstr {
size_t len;