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.
38 lines
1.1 KiB
38 lines
1.1 KiB
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
|
From: Vladimir Serbinenko <phcoder@gmail.com> |
|
Date: Mon, 3 Feb 2014 14:34:27 +0100 |
|
Subject: [PATCH] * util/grub-mkfont.c: Build fix for argp.h with older gcc. |
|
|
|
--- |
|
util/grub-mkfont.c | 4 ++++ |
|
ChangeLog | 4 ++++ |
|
2 files changed, 8 insertions(+) |
|
|
|
diff --git a/util/grub-mkfont.c b/util/grub-mkfont.c |
|
index 3de07ee9c06..e6485b40f28 100644 |
|
--- a/util/grub-mkfont.c |
|
+++ b/util/grub-mkfont.c |
|
@@ -33,7 +33,11 @@ |
|
|
|
#ifndef GRUB_BUILD |
|
#define _GNU_SOURCE 1 |
|
+#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" |
|
#endif |
|
#include <assert.h> |
|
|
|
diff --git a/ChangeLog b/ChangeLog |
|
index 1a822f3d2f2..f2bba8402c5 100644 |
|
--- a/ChangeLog |
|
+++ b/ChangeLog |
|
@@ -1,3 +1,7 @@ |
|
+2014-02-03 Vladimir Serbinenko <phcoder@gmail.com> |
|
+ |
|
+ * util/grub-mkfont.c: Build fix for argp.h with older gcc. |
|
+ |
|
2014-01-29 Vladimir Serbinenko <phcoder@gmail.com> |
|
|
|
* grub-core/disk/ahci.c: Increase timeout. Some SSDs take up to
|
|
|