From 96650a82ecb5c9a0af48a56ce29037fb9bf2d3e1 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Sat, 21 Dec 2013 18:09:19 +0100 Subject: [PATCH] * grub-core/kern/emu/main.c: Build fix for emu. --- ChangeLog | 4 ++++ grub-core/kern/emu/main.c | 4 ++++ 2 files changed, 8 insertions(+) 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;