From a0c638e3d615fd6c55ce55ffbe45f8a092d30660 Mon Sep 17 00:00:00 2001
From: Olaf Barthel <obarthel@gmx.net>
Date: Sat, 14 Aug 2004 10:00:33 +0000
Subject: [PATCH] - memcmp(), memcpy() and memset() now build with the GCC 2.x
 compatibility   header files in place.

git-svn-id: file:///Users/olsen/Code/migration-svn-zu-git/logical-line-staging/clib2/trunk@14708 87f5fb63-7c3d-0410-a384-fd976d0f7a62
---
 library/string_memcmp.c | 10 +++++++++-
 library/string_memcpy.c | 18 +++++++++++++++++-
 library/string_memset.c | 10 +++++++++-
 3 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/library/string_memcmp.c b/library/string_memcmp.c
index ec9ba7b..4da76b7 100644
--- a/library/string_memcmp.c
+++ b/library/string_memcmp.c
@@ -1,5 +1,5 @@
 /*
- * $Id: string_memcmp.c,v 1.1.1.1 2004-07-26 16:32:15 obarthel Exp $
+ * $Id: string_memcmp.c,v 1.2 2004-08-14 10:00:33 obarthel Exp $
  *
  * :ts=4
  *
@@ -154,8 +154,16 @@ __memcmp(const char *m1,const char *m2,size_t len)
 
 /****************************************************************************/
 
+/* This is ugly: GCC 2.95.x assumes that 'unsigned long' is used in the built-in
+   memcmp/memcpy/memset functions instead of 'size_t'. This can produce warnings
+   where none are necessary. */
+#if defined(__GNUC__) && (__GNUC__ < 3)
+int
+memcmp(const void *ptr1, const void *ptr2, unsigned long len)
+#else
 int
 memcmp(const void *ptr1, const void *ptr2, size_t len)
+#endif /* __GNUC__ && __GNUC__ < 3 */
 {
 	int result = 0;
 
diff --git a/library/string_memcpy.c b/library/string_memcpy.c
index a95e2a7..aa1168a 100644
--- a/library/string_memcpy.c
+++ b/library/string_memcpy.c
@@ -1,5 +1,5 @@
 /*
- * $Id: string_memcpy.c,v 1.1.1.1 2004-07-26 16:32:15 obarthel Exp $
+ * $Id: string_memcpy.c,v 1.2 2004-08-14 10:00:33 obarthel Exp $
  *
  * :ts=4
  *
@@ -184,8 +184,16 @@ extern void __bcopy(const void *src,void *dst,size_t len);
 
 /****************************************************************************/
 
+/* This is ugly: GCC 2.95.x assumes that 'unsigned long' is used in the built-in
+   memcmp/memcpy/memset functions instead of 'size_t'. This can produce warnings
+   where none are necessary. */
+#if defined(__GNUC__) && (__GNUC__ < 3)
+void *
+memcpy(void *dst, const void *src, unsigned long len)
+#else
 void *
 memcpy(void *dst, const void *src, size_t len)
+#endif /* __GNUC__ && __GNUC__ < 3 */
 {
 	void * result = dst;
 
@@ -322,8 +330,16 @@ __memcpy(unsigned char * to,unsigned char * from,size_t len)
 
 /****************************************************************************/
 
+/* This is ugly: GCC 2.95.x assumes that 'unsigned long' is used in the built-in
+   memcmp/memcpy/memset functions instead of 'size_t'. This can produce warnings
+   where none are necessary. */
+#if defined(__GNUC__) && (__GNUC__ < 3)
+void *
+memcpy(void *dst, const void *src, unsigned long len)
+#else
 void *
 memcpy(void *dst, const void *src, size_t len)
+#endif /* __GNUC__ && __GNUC__ < 3 */
 {
 	void * result = dst;
 
diff --git a/library/string_memset.c b/library/string_memset.c
index d31b5e0..e216260 100644
--- a/library/string_memset.c
+++ b/library/string_memset.c
@@ -1,5 +1,5 @@
 /*
- * $Id: string_memset.c,v 1.1.1.1 2004-07-26 16:32:17 obarthel Exp $
+ * $Id: string_memset.c,v 1.2 2004-08-14 10:00:33 obarthel Exp $
  *
  * :ts=4
  *
@@ -132,8 +132,16 @@ __memset(unsigned char * to,unsigned char value,size_t len)
 
 /****************************************************************************/
 
+/* This is ugly: GCC 2.95.x assumes that 'unsigned long' is used in the built-in
+   memcmp/memcpy/memset functions instead of 'size_t'. This can produce warnings
+   where none are necessary. */
+#if defined(__GNUC__) && (__GNUC__ < 3)
+void *
+memset(void *ptr, int val, unsigned long len)
+#else
 void *
 memset(void *ptr, int val, size_t len)
+#endif /* __GNUC__ && __GNUC__ < 3 */
 {
 	void * result = ptr;
 	unsigned char * m = ptr;