Merge branch '1.0'

Conflicts:
	configure.ac
	doc/conf.py

diff --git a/CHANGES b/CHANGES
index b755ca0..5aaacb5 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,10 @@
+Version 1.0.4, released 2009-10-11
+
+* Relax Autoconf version requirement to 2.59
+* Make Jansson compile on platforms where plain char is unsigned
+* Fix API tests for object
+
+
 Version 1.0.3, released 2009-09-14
 
 * Check for integer and real overflows and underflows in decoder

diff --git a/configure.ac b/configure.ac
index 2835ad3..c2de72f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
-AC_PREREQ([2.63])
-AC_INIT([jansson], [1.0.3+], [petri@digip.org])
+AC_PREREQ([2.59])
+AC_INIT([jansson], [1.0.4+], [petri@digip.org])
 
 AM_INIT_AUTOMAKE([1.10 foreign])
 

diff --git a/doc/conf.py b/doc/conf.py
index 3ccd920..16d9c80 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.3+'
+release = '1.0.4+'
 
 # 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 a737c90..36f8467 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:3:0
+libjansson_la_LDFLAGS = -version-info 0:4:0
 
 AM_CFLAGS = -Wall -Wextra -Werror

diff --git a/src/dump.c b/src/dump.c
index 042b0c7..93717ab 100644 (file)
--- a/src/dump.c
+++ b/src/dump.c
@@ -70,7 +70,7 @@ static int dump_string(const char *str, dump_func dump, void *data)
         char seq[7];
         int length;
 
-        while(*end && *end != '\\' && *end != '"' && (*end < 0 || *end > 0x1F))
+        while(*end && *end != '\\' && *end != '"' && (unsigned char)*end > 0x1F)
             end++;
 
         if(end != str) {

diff --git a/src/load.c b/src/load.c
index 8d5a392..cdffa11 100644 (file)
--- a/src/load.c
+++ b/src/load.c
@@ -134,7 +134,7 @@ static char stream_get(stream_t *stream, json_error_t *error)
 
         c = stream->buffer[0];
 
-        if(c < 0 && c != EOF)
+        if((unsigned char)c >= 0x80 && c != (char)EOF)
         {
             /* multi-byte UTF-8 sequence */
             int i, count;
@@ -257,14 +257,14 @@ static void lex_scan_string(lex_t *lex, json_error_t *error)
     c = lex_get_save(lex, error);
 
     while(c != '"') {
-        if(c == EOF) {
+        if(c == (char)EOF) {
             lex_unget_unsave(lex, c);
             if(lex_eof(lex))
                 error_set(error, lex, "premature end of input");
             goto out;
         }
 
-        else if(0 <= c && c <= 0x1F) {
+        else if((unsigned char)c <= 0x1F) {
             /* control character */
             lex_unget_unsave(lex, c);
             if(c == '\n')
@@ -518,7 +518,7 @@ static int lex_scan(lex_t *lex, json_error_t *error)
         c = lex_get(lex, error);
     }
 
-    if(c == EOF) {
+    if(c == (char)EOF) {
         if(lex_eof(lex))
             lex->token = TOKEN_EOF;
         else