From c424016136641719a2f7fd8866513b8bc4622a04 Mon Sep 17 00:00:00 2001 From: Robert Millan Date: Sun, 25 Oct 2009 15:14:25 +0000 Subject: [PATCH] 2009-10-25 Robert Millan * include/grub/misc.h: Fix wrong evaluation of APPLE_CC. (memset): Fix function prototype. git-svn-id: svn://svn.savannah.gnu.org/grub/trunk/grub2@2650 d0de0278-0dc1-4c01-8a07-af38b3205e46 --- ChangeLog | 5 +++++ include/grub/misc.h | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 80c593e4..daee3ea4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,9 @@ 2009-10-25 Robert Millan + + * include/grub/misc.h: Fix wrong evaluation of APPLE_CC. + (memset): Fix function prototype. + +2009-10-25 Robert Millan 2009-10-25 Vasily Averin * fs/ext2.c (grub_ext2_iterate_dir): Avoid infinite loop when diff --git a/include/grub/misc.h b/include/grub/misc.h index c7ff1e2d..7589f43a 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); -- 2.11.4.GIT