From 2cc7d26fb52ea8896fa7bb53381d8eea2e62d2c5 Mon Sep 17 00:00:00 2001
From: Sam Ravnborg <sam@ravnborg.org>
Date: Sun, 4 May 2008 21:03:20 +0200
Subject: [PATCH] --- yaml --- r: 95979 b: refs/heads/master c:
 c4143a83031aef7ba87a62cf654d6d8fb4d8e76e h: refs/heads/master i:   95977:
 36e37a0fba68749b95b046219f1b5e233586961c   95975:
 0dae73c98e0d7378dfd36ff7dd3e42e1445697c9 v: v3

---
 [refs]                        | 2 +-
 trunk/scripts/kconfig/lkc.h   | 6 +++---
 trunk/scripts/kconfig/mconf.c | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 546963900b6d..bc9982087801 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ac551828993eecb8499ef9cc3c828fceb49bcf7a
+refs/heads/master: c4143a83031aef7ba87a62cf654d6d8fb4d8e76e
diff --git a/trunk/scripts/kconfig/lkc.h b/trunk/scripts/kconfig/lkc.h
index 4bc68f20a73c..96521cb087ec 100644
--- a/trunk/scripts/kconfig/lkc.h
+++ b/trunk/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/trunk/scripts/kconfig/mconf.c b/trunk/scripts/kconfig/mconf.c
index 734cf4f3131e..6841e95c0989 100644
--- a/trunk/scripts/kconfig/mconf.c
+++ b/trunk/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;
 }
+