summaryrefslogtreecommitdiff
path: root/ext/json/php_json_parser.h
diff options
context:
space:
mode:
authorAaron Piotrowski <aaron@trowski.com>2016-07-03 22:42:10 -0500
committerAaron Piotrowski <aaron@trowski.com>2016-07-03 22:42:10 -0500
commitd9a9cf8ecaef891b2369969e9efe9f6261359158 (patch)
tree04bcc83b3c9be1924007e007e1f508f7229af7ab /ext/json/php_json_parser.h
parent583386d59e6b362fe49e51594718a109d0c0cc2f (diff)
parentc2b29a58bc0916e248ba2584564558097b16b51f (diff)
downloadphp-git-d9a9cf8ecaef891b2369969e9efe9f6261359158.tar.gz
Merge branch 'master' into iterable
Diffstat (limited to 'ext/json/php_json_parser.h')
-rw-r--r--ext/json/php_json_parser.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/json/php_json_parser.h b/ext/json/php_json_parser.h
index f817a2da70..afead526c2 100644
--- a/ext/json/php_json_parser.h
+++ b/ext/json/php_json_parser.h
@@ -55,7 +55,7 @@ typedef struct _php_json_parser_methods {
struct _php_json_parser {
php_json_scanner scanner;
zval *return_value;
- unsigned int depth;
+ int depth;
int max_depth;
php_json_parser_methods methods;
};