diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-04 17:11:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-04 17:11:24 -0700 |
| commit | 10ea18f0deb2372417c8e5be4d2ec79de1f65c4b (patch) | |
| tree | 927da44f6b841c1fd8b5c7f905cd5c44ee63b79a /scripts/kconfig | |
| parent | eb28062f131b0a1da32b2554fd819af5221040de (diff) | |
| parent | 2cb1e1257fb4d4d52c97e763ab262c2295aea4a8 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes:
kconfig-language.txt: remove bogus hint
kconfig: fix MAC OS X warnings in menuconfig
modpost: i2c aliases need no trailing wildcard
Diffstat (limited to 'scripts/kconfig')
| -rw-r--r-- | scripts/kconfig/lkc.h | 6 | ||||
| -rw-r--r-- | scripts/kconfig/mconf.c | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/scripts/kconfig/lkc.h b/scripts/kconfig/lkc.h index 4bc68f20a73c..96521cb087ec 100644 --- a/scripts/kconfig/lkc.h +++ b/scripts/kconfig/lkc.h @@ -11,9 +11,9 @@ #ifndef KBUILD_NO_NLS # include <libintl.h> #else -# define gettext(Msgid) ((const char *) (Msgid)) -# define textdomain(Domainname) ((const char *) (Domainname)) -# define bindtextdomain(Domainname, Dirname) ((const char *) (Dirname)) +static inline const char *gettext(const char *txt) { return txt; } +static inline void textdomain(const char *domainname) {} +static inline void bindtextdomain(const char *name, const char *dir) {} #endif #ifdef __cplusplus diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c index 734cf4f3131e..6841e95c0989 100644 --- a/scripts/kconfig/mconf.c +++ b/scripts/kconfig/mconf.c @@ -773,7 +773,7 @@ static void conf_string(struct menu *menu) while (1) { int res; - char *heading; + const char *heading; switch (sym_get_type(menu->sym)) { case S_INT: @@ -925,3 +925,4 @@ int main(int ac, char **av) return 0; } + |