X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fcommon%2Fcompat%2Fstring.h;h=4a96cb1456ffd2a928d18439007cfc3959b2b5e5;hb=4878de5c7deb512bbdac4fdfc498907efa06fb7c;hp=a18d9e7cab56c2434a67debccf45d05b82252734;hpb=ec5b87f3610b3b0e52ce6109600930deb5996cca;p=lttng-tools.git

diff --git a/src/common/compat/string.h b/src/common/compat/string.h
index a18d9e7ca..4a96cb145 100644
--- a/src/common/compat/string.h
+++ b/src/common/compat/string.h
@@ -25,7 +25,7 @@ size_t lttng_strnlen(const char *str, size_t max)
 	size_t ret;
 	const char *end;
 
-	end = memchr(str, 0, max);
+	end = (const char *) memchr(str, 0, max);
 
 	if (end) {
 		ret = (size_t) (end - str);
@@ -61,7 +61,7 @@ char *lttng_strndup(const char *s, size_t n)
 		navail = n + 1;
 	}
 
-	ret = malloc(navail);
+	ret = (char *) malloc(navail);
 	if (!ret) {
 		goto end;
 	}
@@ -109,18 +109,18 @@ static inline int lttng_fls(int val)
 }
 #endif /* HAVE_FLS */
 
-#if HAVE_MEMRCHR
+#ifdef HAVE_MEMRCHR
 static inline
 void *lttng_memrchr(const void *s, int c, size_t n)
 {
-	return memrchr(s, c, n);
+	return (void *) memrchr(s, c, n);
 }
 #else
 static inline
 void *lttng_memrchr(const void *s, int c, size_t n)
 {
 	int i;
-	const char *str = s;
+	const char *str = (const char *) s;
 	for (i = n-1; i >= 0; i--) {
 		if (str[i] == (char)c) {
 			return (void *)(str+i);