From f53a8e712f6b38f15be81cb692c03c1afacce7ae Mon Sep 17 00:00:00 2001
From: Damien George <damien.p.george@gmail.com>
Date: Sat, 18 Apr 2015 14:27:55 +0100
Subject: [PATCH] lib/libc/string0.c: Remove include of std.h, replace with
string.h.
Much more portable this way.
---
lib/libc/string0.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/lib/libc/string0.c b/lib/libc/string0.c
index b73a5e9ea..136c1b49c 100644
--- a/lib/libc/string0.c
+++ b/lib/libc/string0.c
@@ -25,7 +25,7 @@
*/
#include <stdint.h>
-#include "std.h"
+#include <string.h>
#define likely(x) __builtin_expect((x), 1)
@@ -102,10 +102,12 @@ void *memset(void *s, int c, size_t n) {
return s;
}
-int memcmp(const char *s1, const char *s2, size_t n) {
+int memcmp(const void *s1, const void *s2, size_t n) {
+ const uint8_t *s1_8 = s1;
+ const uint8_t *s2_8 = s2;
while (n--) {
- char c1 = *s1++;
- char c2 = *s2++;
+ char c1 = *s1_8++;
+ char c2 = *s2_8++;
if (c1 < c2) return -1;
else if (c1 > c2) return 1;
}
--
GitLab