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.
40 lines
1.2 KiB
40 lines
1.2 KiB
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
|
From: Vladimir Serbinenko <phcoder@gmail.com> |
|
Date: Sun, 20 Apr 2014 16:12:41 +0200 |
|
Subject: [PATCH] * grub-core/kern/misc.c (__bzero): Don't compile in |
|
GRUB_UTIL. |
|
|
|
Reported by: Yves Blusseau <blusseau@zetam.org>. |
|
--- |
|
grub-core/kern/misc.c | 3 +++ |
|
ChangeLog | 6 ++++++ |
|
2 files changed, 9 insertions(+) |
|
|
|
diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c |
|
index 54db2e1254e..c5c815d8d13 100644 |
|
--- a/grub-core/kern/misc.c |
|
+++ b/grub-core/kern/misc.c |
|
@@ -542,6 +542,9 @@ memset (void *s, int c, grub_size_t n) |
|
return grub_memset (s, c, n); |
|
} |
|
|
|
+#endif |
|
+ |
|
+#if !defined(GRUB_UTIL) && defined(__APPLE__) |
|
void GRUB_BUILTIN_ATTR |
|
__bzero (void *s, grub_size_t n) |
|
{ |
|
diff --git a/ChangeLog b/ChangeLog |
|
index 73a89289945..3b61c0a996d 100644 |
|
--- a/ChangeLog |
|
+++ b/ChangeLog |
|
@@ -1,3 +1,9 @@ |
|
+2014-04-20 Vladimir Serbinenko <phcoder@gmail.com> |
|
+ |
|
+ * grub-core/kern/misc.c (__bzero): Don't compile in GRUB_UTIL. |
|
+ |
|
+ Reported by: Yves Blusseau <blusseau@zetam.org>. |
|
+ |
|
2014-04-20 Piotr Krysiuk <piotras@gmail.com> |
|
|
|
* grub-core/lib/i386/relocator.c: Allow loading old kernels by placing
|
|
|