X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Fmemmem%2Fmemmem.c;fp=ccan%2Fmemmem%2Fmemmem.c;h=48a6de2b18181f233fd71384ed0c5207b66e4429;hb=7bcba7662a50fe9f54009b0abe4a0e96aa6a4ea8;hp=4d3c2e62f75f8a9b057976e0ac10f0acd6deff90;hpb=291237b4fed863be74051274ac5ad9920cb33cc3;p=ccan

diff --git a/ccan/memmem/memmem.c b/ccan/memmem/memmem.c
index 4d3c2e62..48a6de2b 100644
--- a/ccan/memmem/memmem.c
+++ b/ccan/memmem/memmem.c
@@ -1,5 +1,7 @@
 /* CC0 (Public domain) - see LICENSE file for details */
 
+#include "config.h"
+
 #include <string.h>
 #include <ccan/memmem/memmem.h>
 
@@ -15,7 +17,7 @@ void *memmem(const void *haystack, size_t haystacklen,
 	p = haystack;
 
 	for (p = haystack;
-	     (p + needlelen) <= (haystack + haystacklen);
+	     (p + needlelen) <= ((const char *)haystack + haystacklen);
 	     p++)
 		if (memcmp(p, needle, needlelen) == 0)
 			return (void *)p;