From: Sam Ravnborg Date: Sun, 4 May 2008 19:03:20 +0000 (+0200) Subject: kconfig: fix MAC OS X warnings in menuconfig X-Git-Tag: v2.6.26-rc2~77^2~1 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c4143a83031aef7ba87a62cf654d6d8fb4d8e76e;p=linux-2.6-omap-h63xx.git kconfig: fix MAC OS X warnings in menuconfig Signed-off-by: Sam Ravnborg Acked-by: Timur Tabi --- diff --git a/scripts/kconfig/lkc.h b/scripts/kconfig/lkc.h index 4bc68f20a73..96521cb087e 100644 --- a/scripts/kconfig/lkc.h +++ b/scripts/kconfig/lkc.h @@ -11,9 +11,9 @@ #ifndef KBUILD_NO_NLS # include #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 734cf4f3131..6841e95c098 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; } +