From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Sun, 20 Apr 2014 14:12:41 +0000 (+0200)
Subject: 	* grub-core/kern/misc.c (__bzero): Don't compile in GRUB_UTIL.
X-Git-Tag: 2.02-beta3~643
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=4b8b9135f1676924a8458da528d264bbc7bbb301;p=thirdparty%2Fgrub.git

	* grub-core/kern/misc.c (__bzero): Don't compile in GRUB_UTIL.

	Reported by: Yves Blusseau <blusseau@zetam.org>.
---

diff --git a/ChangeLog b/ChangeLog
index 1be8e5e64..ba5e2054f 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
diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
index 54db2e125..c5c815d8d 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)
 {