vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* include/grub/i18n.h (gettext): Inline instead of using #define.

Browse source 
(grub_gettext): Likewise.
	(_): Likewise.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-05-18 14:00:51 +02:00
parent 01b8d2d787
commit 95b97950e2
2 changed files with 26 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2010-05-18 Vladimir Serbinenko <phcoder@gmail.com>
* include/grub/i18n.h (gettext): Inline instead of using #define.
(grub_gettext): Likewise.
(_): Likewise.
2010-05-18 Vladimir Serbinenko <phcoder@gmail.com> 2010-05-18 Vladimir Serbinenko <phcoder@gmail.com>
* Makefile.in (CPPFLAGS): Replace -DGRUB_LIBDIR with * Makefile.in (CPPFLAGS): Replace -DGRUB_LIBDIR with

24
include/grub/i18n.h
View file

@ -42,17 +42,33 @@ extern const char *(*EXPORT_VAR(grub_gettext)) (const char *s);
On pre-ANSI systems without 'const', the config.h file is supposed to On pre-ANSI systems without 'const', the config.h file is supposed to
contain "#define const". */ contain "#define const". */
# ifdef GRUB_UTIL # ifdef GRUB_UTIL
# define gettext(Msgid) ((const char *) (Msgid)) static inline const char * __attribute__ ((always_inline))
gettext (const char *str)
{
return str;
}
# else # else
# define grub_gettext(str) ((const char *) (str)) static inline const char * __attribute__ ((always_inline))
grub_gettext (const char *str)
{
return str;
}
# endif /* GRUB_UTIL */ # endif /* GRUB_UTIL */
#endif /* (defined(ENABLE_NLS) && ENABLE_NLS) */ #endif /* (defined(ENABLE_NLS) && ENABLE_NLS) */
#ifdef GRUB_UTIL #ifdef GRUB_UTIL
# define _(str) gettext(str) static inline const char * __attribute__ ((always_inline))
_ (const char *str)
{
return gettext(str);
}
#else #else
# define _(str) grub_gettext(str) static inline const char * __attribute__ ((always_inline))
_ (const char *str)
{
return grub_gettext(str);
}
#endif /* GRUB_UTIL */ #endif /* GRUB_UTIL */
#define N_(str) str #define N_(str) str