FGCOM/jansson
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '1.0'

Browse Source 
Conflicts:
	configure.ac
	doc/conf.py
This commit is contained in:
Petri Lehtinen
2009-09-06 12:53:38 +03:00
parent 9611780907 ab2d93b724
commit fd259ff68c
5 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile.am
View File

@@ -13,6 +13,6 @@ libjansson_la_SOURCES = \
utf.h \
util.h \
value.c
libjansson_la_LDFLAGS = -version-info 0:0:0
libjansson_la_LDFLAGS = -version-info 0:1:0
AM_CFLAGS = -Wall -Wextra -Werror

2
src/jansson.h
View File

@@ -38,7 +38,7 @@ typedef struct {
#define json_is_number(json) (json_is_integer(json) || json_is_real(json))
#define json_is_true(json) (json && json_typeof(json) == JSON_TRUE)
#define json_is_false(json) (json && json_typeof(json) == JSON_FALSE)
#define json_is_boolean(json) (jsin_is_true(json) || json_is_false(json))
#define json_is_boolean(json) (json_is_true(json) || json_is_false(json))
#define json_is_null(json) (json && json_typeof(json) == JSON_NULL)
/* construction, destruction, reference counting */