Merge branch '1.0'

Conflicts:
	configure.ac
	doc/conf.py

diff --git a/CHANGES b/CHANGES
new file mode 100644 (file)
index 0000000..087e5e0
--- /dev/null
+++ b/CHANGES
@@ -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

diff --git a/configure.ac b/configure.ac
index 783e264..f7fe011 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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])
 

diff --git a/doc/conf.py b/doc/conf.py
index 7629a03..bd88c6b 100644 (file)
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -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.

diff --git a/src/Makefile.am b/src/Makefile.am
index 7446fc8..50b1e69 100644 (file)
--- 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 (file)
--- 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 */