grub2/0020-util-grub-mount.c-Extend-GCC-warning-workaround-to-g.patch
Peter Jones 3f2879cb30 Rebase to upstream.
Signed-off-by: Peter Jones <pjones@redhat.com>
2014-05-09 16:33:04 -04:00

48 lines
1.3 KiB
Diff

From a97ddeedaa2d65158ea9489cb73ff187fd8ff306 Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Sat, 18 Jan 2014 16:43:29 +0100
Subject: [PATCH 020/103] * util/grub-mount.c: Extend GCC warning
workaround to grub-mount.
---
ChangeLog | 4 ++++
util/grub-mount.c | 7 ++++++-
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index b42fd65..7241046 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2014-01-18 Vladimir Serbinenko <phcoder@gmail.com>
+ * util/grub-mount.c: Extend GCC warning workaround to grub-mount.
+
+2014-01-18 Vladimir Serbinenko <phcoder@gmail.com>
+
* grub-core/kern/efi/efi.c: Ensure that the result starts with /
and has no //.
diff --git a/util/grub-mount.c b/util/grub-mount.c
index 118881e..19de2e6 100644
--- a/util/grub-mount.c
+++ b/util/grub-mount.c
@@ -41,8 +41,13 @@
#include <string.h>
#include <stdlib.h>
+#pragma GCC diagnostic ignored "-Wmissing-prototypes"
+#pragma GCC diagnostic ignored "-Wmissing-declarations"
+#include <argp.h>
+#pragma GCC diagnostic error "-Wmissing-prototypes"
+#pragma GCC diagnostic error "-Wmissing-declarations"
+
#include "progname.h"
-#include "argp.h"
static const char *root = NULL;
grub_device_t dev = NULL;
--
1.9.0