diff options
| author | Sam Ravnborg <sam@ravnborg.org> | 2008-05-04 15:03:20 -0400 |
|---|---|---|
| committer | Sam Ravnborg <sam@ravnborg.org> | 2008-05-04 15:03:20 -0400 |
| commit | c4143a83031aef7ba87a62cf654d6d8fb4d8e76e (patch) | |
| tree | 09a20ad30bd9b48976e672c2c19f54fc2b328970 | |
| parent | ac551828993eecb8499ef9cc3c828fceb49bcf7a (diff) | |
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 @@ | |||
| 11 | #ifndef KBUILD_NO_NLS | 11 | #ifndef KBUILD_NO_NLS |
| 12 | # include <libintl.h> | 12 | # include <libintl.h> |
| 13 | #else | 13 | #else |
| 14 | # define gettext(Msgid) ((const char *) (Msgid)) | 14 | static inline const char *gettext(const char *txt) { return txt; } |
| 15 | # define textdomain(Domainname) ((const char *) (Domainname)) | 15 | static inline void textdomain(const char *domainname) {} |
| 16 | # define bindtextdomain(Domainname, Dirname) ((const char *) (Dirname)) | 16 | static inline void bindtextdomain(const char *name, const char *dir) {} |
| 17 | #endif | 17 | #endif |
| 18 | 18 | ||
| 19 | #ifdef __cplusplus | 19 | #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) | |||
| 773 | 773 | ||
| 774 | while (1) { | 774 | while (1) { |
| 775 | int res; | 775 | int res; |
| 776 | char *heading; | 776 | const char *heading; |
| 777 | 777 | ||
| 778 | switch (sym_get_type(menu->sym)) { | 778 | switch (sym_get_type(menu->sym)) { |
| 779 | case S_INT: | 779 | case S_INT: |
| @@ -925,3 +925,4 @@ int main(int ac, char **av) | |||
| 925 | 925 | ||
| 926 | return 0; | 926 | return 0; |
| 927 | } | 927 | } |
| 928 | |||
