Ooops, return values...

diff --git a/ext/json/JSON_parser.h b/ext/json/JSON_parser.h
index e02c9fc5348cab00a7c2dc0dd1c1232f1a1e44af..541664b8c6f65b9922054c7268dd3a78659b6bbd 100644 (file)
--- a/ext/json/JSON_parser.h
+++ b/ext/json/JSON_parser.h
@@ -34,7 +34,7 @@ extern int free_JSON_parser(JSON_parser jp);
 
 static inline int parse_JSON(JSON_parser jp, zval *z, unsigned short utf16_json[], int length, int assoc TSRMLS_DC)
 {
-       parse_JSON_ex(jp, z, utf16_json, length, assoc ? PHP_JSON_OBJECT_AS_ARRAY : 0 TSRMLS_CC);
+       return parse_JSON_ex(jp, z, utf16_json, length, assoc ? PHP_JSON_OBJECT_AS_ARRAY : 0 TSRMLS_CC);
 }
 
 #endif

diff --git a/ext/json/php_json.h b/ext/json/php_json.h
index 7b67c10d2f943c806c6ab675712afc3d9ff8134d..fd5287c0e5f80a42a51e52a60aa36bfe89c0fd61 100644 (file)
--- a/ext/json/php_json.h
+++ b/ext/json/php_json.h
@@ -68,7 +68,7 @@ extern zend_class_entry *php_json_serializable_ce;
 #define PHP_JSON_OBJECT_AS_ARRAY       (1<<0)
 #define PHP_JSON_BIGINT_AS_STRING      (1<<1)
 
-static inline php_json_decode(zval *return_value, char *str, int str_len, zend_bool assoc, long depth TSRMLS_DC)
+static inline void php_json_decode(zval *return_value, char *str, int str_len, zend_bool assoc, long depth TSRMLS_DC)
 {
        php_json_decode_ex(return_value, str, str_len, assoc ? PHP_JSON_OBJECT_AS_ARRAY : 0, depth TSRMLS_CC);
 }