memcmp replacement fixes

diff --git a/include/ac/string.h b/include/ac/string.h
index 239a421a0eb7d5e9e977f6d664a51e4ce9478127..3d5725fd5e9de09b3bf01f9466e0268305cb0d55 100644 (file)
--- a/include/ac/string.h
+++ b/include/ac/string.h
@@ -89,6 +89,11 @@ int (strncasecmp)();
                else AC_MEMCPY( (d), (s), (n) ); \
        } while(0)
 
+#ifdef NEED_MEMCMP_REPLACEMENT
+       int (lutil_memcmp)(const void *b1, const void *b2, size_t len);
+#define memcmp lutil_memcmp
+#endif
+
 #define STRLENOF(s)    (sizeof(s)-1)
 
 #endif /* _AC_STRING_H */

diff --git a/libraries/liblutil/memcmp.c b/libraries/liblutil/memcmp.c
index 2dcd8c1b035cdd4a8733289f817c9369f401ae39..c4d2537ef8049c794608042c5ac44327c444c501 100644 (file)
--- a/libraries/liblutil/memcmp.c
+++ b/libraries/liblutil/memcmp.c
@@ -21,14 +21,13 @@
  * Memory Compare
  */
 int
-(memcmp)(const void *v1, const void *v2, int n) 
+(lutil_memcmp)(const void *v1, const void *v2, size_t n) 
 {
     if (n != 0) {
                const unsigned char *s1=v1, *s2=v2;
         do {
-            if (*s1++ != *s2++)
-                return (*--s1 - *--s2);
+            if (*s1++ != *s2++) return *--s1 - *--s2;
         } while (--n != 0);
     }
-    return (0);
+    return 0;
 }