Merge tag '1.4' into since

Version 1.4

1 files changed, 4 insertions, 4 deletions

diff --git a/memrmem.c b/memrmem.c
index 3968e73..a06cdbf 100644
--- a/memrmem.c
+++ b/memrmem.c
@@ -1,16 +1,16 @@
 /* See LICENSE file for copyright and license details. */
-#include "libsimple.h"
+#include "common.h"
 #ifndef TEST
 
 
 void *
 libsimple_memrmem(const void *hay_, size_t hayn, const void *sub_, size_t subn)
 {
-	char *hay = (void *)hay_, *start;
+	const char *hay = hay_, *start;
 	const char *sub = sub_;
 
 	if (!subn)
-		return &hay[hayn];
+		return &REMOVE_CONST(hay, char *)[hayn];
 	if (hayn < subn)
 		return NULL;
 	if (subn == 1)
@@ -20,7 +20,7 @@ libsimple_memrmem(const void *hay_, size_t hayn, const void *sub_, size_t subn)
 	hay = &hay[hayn - subn];
 	do {
 		if (*hay == *sub && !memcmp(hay, sub, subn))
-			return hay;
+			return REMOVE_CONST(hay, char *);
 	} while (hay-- != start);
 
 	return NULL;