Merge tag '1.4' into since

Version 1.4

1 files changed, 5 insertions, 2 deletions

diff --git a/memends.c b/memends.c
index f579222..cf09f65 100644
--- a/memends.c
+++ b/memends.c
@@ -1,5 +1,5 @@
 /* See LICENSE file for copyright and license details. */
-#include "libsimple.h"
+#include "common.h"
 #ifndef TEST
 
 
@@ -9,9 +9,12 @@ libsimple_memends(const void *s_, size_t n, const void *t_, size_t m)
 	const char *s = s_, *t = t_;
 	if (n < m)
 		return 0;
-	while (n--, m--)
+	while (m) {
+		n--;
+		m--;
 		if (s[n] != t[m])
 			return 0;
+	}
 	return 1;
 }