Blame SOURCES/0080-grub-core-kern-misc.c-__bzero-Don-t-compile-in-GRUB_.patch

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