* 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 1be8e5e6444955c4816de216737d41690e4bd260..ba5e2054f80155f9b8f94aceeb411c3d0034a201 100644 (file)
--- 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 54db2e1254ef931746f2b5effb9bc881bdd9e8f7..c5c815d8d13b627f8529381ecd98fb7ee795c90e 100644 (file)
--- 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)
 {