Merge branch '2.4'

Makefile.am

@@ -8,3 +8,8 @@ dvi:
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = jansson.pc
+
+if GCC
+# These flags are gcc specific
+export AM_CFLAGS = -Wall -Wextra -Wdeclaration-after-statement
+endif

src/Makefile.am

@@ -22,8 +22,3 @@ libjansson_la_LDFLAGS = \
 	-no-undefined \
 	-export-symbols-regex '^json_' \
 	-version-info 8:0:4
-
-if GCC
-# These flags are gcc specific
-AM_CFLAGS = -Wall -Wextra -Wdeclaration-after-statement -Werror
-endif

test/bin/Makefile.am

@@ -1,6 +1,5 @@
 check_PROGRAMS = json_process
 
 AM_CPPFLAGS = -I$(top_builddir)/src -I$(top_srcdir)/src
-AM_CFLAGS = -Wall -Werror
 LDFLAGS = -static  # for speed and Valgrind
 LDADD = $(top_builddir)/src/libjansson.la

test/bin/json_process.c

@@ -113,7 +113,7 @@ int main(int argc, char *argv[])
         char *buffer = NULL;
 
         while(1) {
-            int count;
+            size_t count;
 
             size = (size == 0 ? 128 : size * 2);
             buffer = realloc(buffer, size);

test/suites/api/Makefile.am

@@ -30,6 +30,5 @@ test_simple_SOURCES = test_simple.c util.h
 test_unpack_SOURCES = test_unpack.c util.h
 
 AM_CPPFLAGS = -I$(top_builddir)/src -I$(top_srcdir)/src
-AM_CFLAGS = -Wall -Werror
 LDFLAGS = -static  # for speed and Valgrind
 LDADD = $(top_builddir)/src/libjansson.la

test/suites/api/test_array.c

@@ -11,7 +11,7 @@
 static void test_misc(void)
 {
     json_t *array, *five, *seven, *value;
-    int i;
+    size_t i;
 
     array = json_array();
     five = json_integer(5);