diff --git a/ChangeLog b/ChangeLog
index 80c593e4b..daee3ea4c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-10-25  Robert Millan  <rmh.grub@aybabtu.com>
+
+	* include/grub/misc.h: Fix wrong evaluation of APPLE_CC.
+	(memset): Fix function prototype.
+
 2009-10-25  Robert Millan  <rmh.grub@aybabtu.com>
 2009-10-25  Vasily Averin  <vvs@parallels.com>
 
diff --git a/include/grub/misc.h b/include/grub/misc.h
index c7ff1e2d2..7589f43a2 100644
--- a/include/grub/misc.h
+++ b/include/grub/misc.h
@@ -75,11 +75,11 @@ grub_strncat (char *dest, const char *src, int c)
 }
 
 /* Prototypes for aliases.  */
-#if !defined (GRUB_UTIL) || !defined (APPLE_CC)
+#if !defined (GRUB_UTIL) && !defined (APPLE_CC)
 int EXPORT_FUNC(memcmp) (const void *s1, const void *s2, grub_size_t n);
 void *EXPORT_FUNC(memmove) (void *dest, const void *src, grub_size_t n);
 void *EXPORT_FUNC(memcpy) (void *dest, const void *src, grub_size_t n);
-void EXPORT_FUNC (memset) (void);
+void *EXPORT_FUNC(memset) (void *s, int c, grub_size_t n);
 #endif
 
 int EXPORT_FUNC(grub_memcmp) (const void *s1, const void *s2, grub_size_t n);