You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
48 lines
1.3 KiB
48 lines
1.3 KiB
7 years ago
|
From 762b39fcff62416481f12d2002abf7cdb76adbf3 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Vladimir Serbinenko <phcoder@gmail.com>
|
||
|
|
Date: Sat, 18 Jan 2014 16:43:29 +0100
|
||
|
|
Subject: [PATCH 021/237] * 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 b04a4ef..8534158 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;
|
||
|
|
--
|
||
|
|
2.9.3
|
||
|
|
|