Enable gcc specific flags in tests correctly
... and fix issues found.
This commit is contained in:
parent
02beb90db3
commit
93a3c7f663
@ -8,3 +8,8 @@ dvi:
|
|||||||
|
|
||||||
pkgconfigdir = $(libdir)/pkgconfig
|
pkgconfigdir = $(libdir)/pkgconfig
|
||||||
pkgconfig_DATA = jansson.pc
|
pkgconfig_DATA = jansson.pc
|
||||||
|
|
||||||
|
if GCC
|
||||||
|
# These flags are gcc specific
|
||||||
|
export AM_CFLAGS = -Wall -Wextra -Wdeclaration-after-statement -Werror
|
||||||
|
endif
|
||||||
|
@ -22,8 +22,3 @@ libjansson_la_LDFLAGS = \
|
|||||||
-no-undefined \
|
-no-undefined \
|
||||||
-export-symbols-regex '^json_' \
|
-export-symbols-regex '^json_' \
|
||||||
-version-info 8:0:4
|
-version-info 8:0:4
|
||||||
|
|
||||||
if GCC
|
|
||||||
# These flags are gcc specific
|
|
||||||
AM_CFLAGS = -Wall -Wextra -Wdeclaration-after-statement -Werror
|
|
||||||
endif
|
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
check_PROGRAMS = json_process
|
check_PROGRAMS = json_process
|
||||||
|
|
||||||
AM_CPPFLAGS = -I$(top_builddir)/src -I$(top_srcdir)/src
|
AM_CPPFLAGS = -I$(top_builddir)/src -I$(top_srcdir)/src
|
||||||
AM_CFLAGS = -Wall -Werror
|
|
||||||
LDFLAGS = -static # for speed and Valgrind
|
LDFLAGS = -static # for speed and Valgrind
|
||||||
LDADD = $(top_builddir)/src/libjansson.la
|
LDADD = $(top_builddir)/src/libjansson.la
|
||||||
|
@ -113,7 +113,7 @@ int main(int argc, char *argv[])
|
|||||||
char *buffer = NULL;
|
char *buffer = NULL;
|
||||||
|
|
||||||
while(1) {
|
while(1) {
|
||||||
int count;
|
size_t count;
|
||||||
|
|
||||||
size = (size == 0 ? 128 : size * 2);
|
size = (size == 0 ? 128 : size * 2);
|
||||||
buffer = realloc(buffer, size);
|
buffer = realloc(buffer, size);
|
||||||
|
@ -30,6 +30,5 @@ test_simple_SOURCES = test_simple.c util.h
|
|||||||
test_unpack_SOURCES = test_unpack.c util.h
|
test_unpack_SOURCES = test_unpack.c util.h
|
||||||
|
|
||||||
AM_CPPFLAGS = -I$(top_builddir)/src -I$(top_srcdir)/src
|
AM_CPPFLAGS = -I$(top_builddir)/src -I$(top_srcdir)/src
|
||||||
AM_CFLAGS = -Wall -Werror
|
|
||||||
LDFLAGS = -static # for speed and Valgrind
|
LDFLAGS = -static # for speed and Valgrind
|
||||||
LDADD = $(top_builddir)/src/libjansson.la
|
LDADD = $(top_builddir)/src/libjansson.la
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
static void test_misc(void)
|
static void test_misc(void)
|
||||||
{
|
{
|
||||||
json_t *array, *five, *seven, *value;
|
json_t *array, *five, *seven, *value;
|
||||||
int i;
|
size_t i;
|
||||||
|
|
||||||
array = json_array();
|
array = json_array();
|
||||||
five = json_integer(5);
|
five = json_integer(5);
|
||||||
|
Loading…
Reference in New Issue
Block a user