diff options
| author | Sam Ravnborg <sam@ravnborg.org> | 2008-05-04 21:03:20 +0200 |
|---|---|---|
| committer | Sam Ravnborg <sam@ravnborg.org> | 2008-05-04 21:03:20 +0200 |
| commit | c4143a83031aef7ba87a62cf654d6d8fb4d8e76e (patch) | |
| tree | 09a20ad30bd9b48976e672c2c19f54fc2b328970 | |
| parent | modpost: i2c aliases need no trailing wildcard (diff) | |
| download | linux-c4143a83031aef7ba87a62cf654d6d8fb4d8e76e.tar.xz linux-c4143a83031aef7ba87a62cf654d6d8fb4d8e76e.zip | |
kconfig: fix MAC OS X warnings in menuconfig
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Acked-by: Timur Tabi <timur@freescale.com>
| -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; } + |