From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 21 May 2010 18:12:41 +0000 (+0200)
Subject: 	* include/grub/i18n.h: Always enable grub_gettext.
X-Git-Tag: 1.99~883
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=39fbb79aa15e66e4516588bb2f74c1052218d8e6;p=thirdparty%2Fgrub.git

	* include/grub/i18n.h: Always enable grub_gettext.
---

diff --git a/ChangeLog b/ChangeLog
index 090cd645d..081ea4a1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-21  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* include/grub/i18n.h: Always enable grub_gettext.
+
 2010-05-21  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* kern/i386/pc/init.c (make_install_device): Fix a leftover usage of old
diff --git a/include/grub/i18n.h b/include/grub/i18n.h
index 57ca1c45b..a91d73346 100644
--- a/include/grub/i18n.h
+++ b/include/grub/i18n.h
@@ -22,10 +22,10 @@
 #include <config.h>
 #include <grub/symbol.h>
 
-extern const char *(*EXPORT_VAR(grub_gettext)) (const char *s);
-
 /* NLS can be disabled through the configure --disable-nls option.  */
-#if (defined(ENABLE_NLS) && ENABLE_NLS)
+#if (defined(ENABLE_NLS) && ENABLE_NLS) || !defined (GRUB_UTIL)
+
+extern const char *(*EXPORT_VAR(grub_gettext)) (const char *s);
 
 # ifdef GRUB_UTIL
 
@@ -41,19 +41,11 @@ extern const char *(*EXPORT_VAR(grub_gettext)) (const char *s);
    for invalid uses of the value returned from these functions.
    On pre-ANSI systems without 'const', the config.h file is supposed to
    contain "#define const".  */
-# ifdef GRUB_UTIL
 static inline const char * __attribute__ ((always_inline))
 gettext (const char *str)
 {
   return str;
 }
-# else
-static inline const char * __attribute__ ((always_inline))
-grub_gettext (const char *str)
-{
-  return str;
-}
-# endif /* GRUB_UTIL */
 
 #endif /* (defined(ENABLE_NLS) && ENABLE_NLS) */