Fix a build failure (-Wundef -Werror) when ENABLE_NLS is not defined,

which is the case with --disabled-nls.

	* include/grub/i18n.h: Use (defined(ENABLE_NLS)
	&& ENABLE_NLS) instead of ENABLE_NLS in all #if preprocessor macros.
	* util/misc.c: Likewise.
	* util/mkisofs/mkisofs.c: Likewise.
	* util/mkisofs/mkisofs.h: Likewise.
This commit is contained in:
Grégoire Sutre authored and Vladimir 'phcoder' Serbinenko committed 2010-03-27 12:19:32 +01:00
1 parent 969d1c782d
commit 394a3120a7
5 files changed
+21 -10

No files matched your search

+3 -3
View File
@@ -30,12 +30,12 @@
#include <prototyp.h>
#include <sys/stat.h>
#if ENABLE_NLS
#if (defined(ENABLE_NLS) && ENABLE_NLS)
# include <locale.h>
# include <libintl.h>
#else /* ! ENABLE_NLS */
#else /* ! (defined(ENABLE_NLS) && ENABLE_NLS) */
/* Disabled NLS.
The casts to 'const char *' serve the purpose of producing warnings
@@ -43,7 +43,7 @@
On pre-ANSI systems without 'const', the config.h file is supposed to
contain "#define const". */
# define gettext(Msgid) ((const char *) (Msgid))
#endif /* ENABLE_NLS */
#endif /* (defined(ENABLE_NLS) && ENABLE_NLS) */
#define _(str) gettext(str)
#define N_(str) str