diff options
| author | Petri Lehtinen <petri@digip.org> | 2009-09-06 12:53:38 +0300 |
|---|---|---|
| committer | Petri Lehtinen <petri@digip.org> | 2009-09-06 12:53:38 +0300 |
| commit | fd259ff68c095c613acf952cc63407f294241923 (patch) | |
| tree | 7a6f444415386d8019e51c9604c21a42159b9272 /src | |
| parent | 9611780907cdb0154bd41232df7b2a41903a4ca5 (diff) | |
| parent | ab2d93b72486eda30e868b226bec5dcd5ec3273e (diff) | |
| download | jansson-fd259ff68c095c613acf952cc63407f294241923.zip jansson-fd259ff68c095c613acf952cc63407f294241923.tar.gz jansson-fd259ff68c095c613acf952cc63407f294241923.tar.bz2 | |
Merge branch '1.0'
Conflicts:
configure.ac
doc/conf.py
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/jansson.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 7446fc8..50b1e69 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -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 diff --git a/src/jansson.h b/src/jansson.h index 09af7bf..3aa10de 100644 --- a/src/jansson.h +++ b/src/jansson.h @@ -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 */ |