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

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

Browse source 
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 2010-03-27 12:19:32 +01:00 • committed by Vladimir 'phcoder' Serbinenko
parent 969d1c782d
commit 394a3120a7
5 changed files with 21 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
2010-03-27 Grégoire Sutre <gregoire.sutre@gmail.com>
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.
2010-03-27 Vladimir Serbinenko <phcoder@gmail.com> 2010-03-27 Vladimir Serbinenko <phcoder@gmail.com>
Simplify Apple CC support. Simplify Apple CC support.

6
include/grub/i18n.h
View file

@ -25,7 +25,7 @@
extern const char *(*EXPORT_VAR(grub_gettext)) (const char *s); extern const char *(*EXPORT_VAR(grub_gettext)) (const char *s);
/* NLS can be disabled through the configure --disable-nls option. */ /* NLS can be disabled through the configure --disable-nls option. */
#if ENABLE_NLS #if (defined(ENABLE_NLS) && ENABLE_NLS)
# ifdef GRUB_UTIL # ifdef GRUB_UTIL
@ -34,7 +34,7 @@ extern const char *(*EXPORT_VAR(grub_gettext)) (const char *s);
# endif /* GRUB_UTIL */ # endif /* GRUB_UTIL */
#else /* ! ENABLE_NLS */ #else /* ! (defined(ENABLE_NLS) && ENABLE_NLS) */
/* Disabled NLS. /* Disabled NLS.
The casts to 'const char *' serve the purpose of producing warnings The casts to 'const char *' serve the purpose of producing warnings
@ -47,7 +47,7 @@ extern const char *(*EXPORT_VAR(grub_gettext)) (const char *s);
# define grub_gettext(str) ((const char *) (str)) # define grub_gettext(str) ((const char *) (str))
# endif /* GRUB_UTIL */ # endif /* GRUB_UTIL */
#endif /* ENABLE_NLS */ #endif /* (defined(ENABLE_NLS) && ENABLE_NLS) */
#ifdef GRUB_UTIL #ifdef GRUB_UTIL
# define _(str) gettext(str) # define _(str) gettext(str)

4
util/misc.c
View file

@ -604,10 +604,10 @@ make_system_path_relative_to_its_root (const char *path)
void void
grub_util_init_nls (void) grub_util_init_nls (void)
{ {
#if ENABLE_NLS #if (defined(ENABLE_NLS) && ENABLE_NLS)
setlocale (LC_ALL, ""); setlocale (LC_ALL, "");
bindtextdomain (PACKAGE, LOCALEDIR); bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE); textdomain (PACKAGE);
#endif /* ENABLE_NLS */ #endif /* (defined(ENABLE_NLS) && ENABLE_NLS) */
} }
#endif #endif

4
util/mkisofs/mkisofs.c
View file

@ -640,11 +640,11 @@ int FDECL2(main, int, argc, char **, argv){
char *log_file = 0; char *log_file = 0;
set_program_name (argv[0]); set_program_name (argv[0]);
#if ENABLE_NLS #if (defined(ENABLE_NLS) && ENABLE_NLS)
setlocale (LC_ALL, ""); setlocale (LC_ALL, "");
bindtextdomain (PACKAGE, LOCALEDIR); bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE); textdomain (PACKAGE);
#endif /* ENABLE_NLS */ #endif /* (defined(ENABLE_NLS) && ENABLE_NLS) */
if (argc < 2) if (argc < 2)
usage(); usage();

6
util/mkisofs/mkisofs.h
View file

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