--- embedaddon/php/ext/json/JSON_parser.h	2012/02/21 23:47:57	1.1
+++ embedaddon/php/ext/json/JSON_parser.h	2012/05/29 12:34:40	1.1.1.2
@@ -5,6 +5,7 @@
 
 #include "php.h"
 #include "ext/standard/php_smart_str.h"
+#include "php_json.h"
 
 #define JSON_PARSER_DEFAULT_DEPTH 512
 
@@ -28,6 +29,12 @@ enum error_codes {
 };
 
 extern JSON_parser new_JSON_parser(int depth);
-extern int parse_JSON(JSON_parser jp, zval *z, unsigned short utf16_json[], int length, int assoc TSRMLS_DC);
+extern int parse_JSON_ex(JSON_parser jp, zval *z, unsigned short utf16_json[], int length, int options TSRMLS_DC);
 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)
+{
+	return parse_JSON_ex(jp, z, utf16_json, length, assoc ? PHP_JSON_OBJECT_AS_ARRAY : 0 TSRMLS_CC);
+}
+
 #endif