From: robertmh <robertmh@localhost>
Date: Sat, 24 Oct 2009 23:26:42 +0000 (+0000)
Subject: 2009-10-25  Robert Millan  <rmh.grub@aybabtu.com>
X-Git-Tag: 1.98~486
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cdb308b0e156f2081c77e30b92bad5ebac4fdf11;p=thirdparty%2Fgrub.git

2009-10-25  Robert Millan  <rmh.grub@aybabtu.com>

        * include/grub/powerpc/libgcc.h (memset): Remove function prototype.
        * include/grub/sparc64/libgcc.h (memset): Likewise.
        * include/grub/misc.h (memset, memcmp): New function prototypes.
---

diff --git a/ChangeLog b/ChangeLog
index 51e76499b..9df444755 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-10-25  Robert Millan  <rmh.grub@aybabtu.com>
+
+	* include/grub/powerpc/libgcc.h (memset): Remove function prototype.
+	* include/grub/sparc64/libgcc.h (memset): Likewise.
+	* include/grub/misc.h (memset, memcmp): New function prototypes.
+
 2009-10-25  Robert Millan  <rmh.grub@aybabtu.com>
 
 	* fs/cpio.c [MODE_USTAR]: Finish `tar' module instead of
diff --git a/include/grub/misc.h b/include/grub/misc.h
index a63a0b442..c7ff1e2d2 100644
--- a/include/grub/misc.h
+++ b/include/grub/misc.h
@@ -76,8 +76,10 @@ grub_strncat (char *dest, const char *src, int c)
 
 /* Prototypes for aliases.  */
 #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);
 #endif
 
 int EXPORT_FUNC(grub_memcmp) (const void *s1, const void *s2, grub_size_t n);
diff --git a/include/grub/powerpc/libgcc.h b/include/grub/powerpc/libgcc.h
index 0ff8964b7..c32fcd87f 100644
--- a/include/grub/powerpc/libgcc.h
+++ b/include/grub/powerpc/libgcc.h
@@ -16,7 +16,6 @@
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-void EXPORT_FUNC (memset) (void);
 void EXPORT_FUNC (__ashldi3) (void);
 void EXPORT_FUNC (__ashrdi3) (void);
 void EXPORT_FUNC (__lshrdi3) (void);
diff --git a/include/grub/sparc64/libgcc.h b/include/grub/sparc64/libgcc.h
index 4a6b6194d..008821d81 100644
--- a/include/grub/sparc64/libgcc.h
+++ b/include/grub/sparc64/libgcc.h
@@ -18,8 +18,6 @@
 
 #include <config.h>
 
-void EXPORT_FUNC (memset) (void);
-
 #ifdef HAVE___BSWAPSI2
 typedef int SItype __attribute__ ((mode (SI)));
 SItype EXPORT_FUNC (__bswapsi2) (SItype);