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
commit fd259ff68c
5 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGES Normal file
View File

@ -0,0 +1,7 @@
Version 1.0.1, released 2009-09-04
* Fixed broken json_is_boolean()
Version 1.0, released 2009-08-25
* Initial release

2
configure.ac
View File

@ -1,5 +1,5 @@
AC_PREREQ([2.63])
AC_INIT([jansson], [1.0+], [petri@digip.org])
AC_INIT([jansson], [1.0.1+], [petri@digip.org])
AM_INIT_AUTOMAKE([1.10 foreign])

2
doc/conf.py
View File

@ -52,7 +52,7 @@ copyright = u'2009, Petri Lehtinen'
# The short X.Y version.
version = '1.0'
# The full version, including alpha/beta/rc tags.
release = '1.0+'
release = '1.0.1+'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.

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 */