Merge tag '1.4' into since

Version 1.4

1 files changed, 4 insertions, 3 deletions

diff --git a/asprintf.c b/asprintf.c
index 25bf07b..d2de1b3 100644
--- a/asprintf.c
+++ b/asprintf.c
@@ -1,5 +1,5 @@
 /* See LICENSE file for copyright and license details. */
-#include "libsimple.h"
+#include "common.h"
 #ifndef TEST
 
 
@@ -21,10 +21,11 @@ libsimple_asprintf(char **strp, const char *fmt, ...)
 int
 main(void)
 {
-	char *s = "";
+	char empty[1] = "";
+	char *s = empty;
 	char *old = s;
 
-	assert(libsimple_asprintf(&s, "%i %X", 99999, 255) == sizeof("99999 FF") - 1);
+	assert(libsimple_asprintf(&s, "%i %X", 99999, 255U) == sizeof("99999 FF") - 1);
 	assert(s && s != old);
 	assert(!strcmpnul(s, "99999 FF"));
 	free(s);