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

diff --git a/ChangeLog b/ChangeLog
index 090cd645d1c522b316ad5dd3395966020c90440a..081ea4a1d4c988ea392747271531ecd3ff0398d1 100644 (file)
--- 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 57ca1c45be1b66dd54fd3fd8d37936f813674918..a91d73346e45c947a46fab27b95ed7617a8f12b8 100644 (file)
--- 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) */