From: Vladimir Serbinenko Date: Sat, 21 Dec 2013 17:09:19 +0000 (+0100) Subject: * grub-core/kern/emu/main.c: Build fix for emu. X-Git-Tag: grub-2.02-beta2~41 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96650a82ecb5c9a0af48a56ce29037fb9bf2d3e1;p=thirdparty%2Fgrub.git * grub-core/kern/emu/main.c: Build fix for emu. --- diff --git a/ChangeLog b/ChangeLog index c3aa95e35..865da058b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-12-21 Vladimir Serbinenko + + * grub-core/kern/emu/main.c: Build fix for emu. + 2013-12-21 Vladimir Serbinenko Build fixes for argp.h with older gcc. diff --git a/grub-core/kern/emu/main.c b/grub-core/kern/emu/main.c index eddb192f9..4b509139c 100644 --- a/grub-core/kern/emu/main.c +++ b/grub-core/kern/emu/main.c @@ -98,6 +98,8 @@ static struct argp_option options[] = { { 0, 0, 0, 0, 0, 0 } }; +#pragma GCC diagnostic ignored "-Wformat-nonliteral" + static char * help_filter (int key, const char *text, void *input __attribute__ ((unused))) { @@ -112,6 +114,8 @@ help_filter (int key, const char *text, void *input __attribute__ ((unused))) } } +#pragma GCC diagnostic error "-Wformat-nonliteral" + struct arguments { const char *dev_map;