better alignment + support size_t

1 files changed, 3 insertions, 3 deletions

diff --git a/ext/json/php_json_scanner.h b/ext/json/php_json_scanner.h
index 4b031a4f12..f515ff55cd 100644
--- a/ext/json/php_json_scanner.h
+++ b/ext/json/php_json_scanner.h
@@ -32,15 +32,15 @@ typedef struct _php_json_scanner {
 	php_json_ctype *ctxmarker;      /* marker position for context backtracking */
 	php_json_ctype *str_start;      /* start position of the string */
 	php_json_ctype *pstr;           /* string pointer for escapes conversion */
+	zval value;                     /* value */
 	int str_esc;                    /* number of extra characters for escaping */
 	int state;                      /* condition state */             
-	zval value;                     /* value */
-	long options;                   /* options */
+	int options;                   /* options */
 	php_json_error_code errcode;    /* error type if there is an error */
 } php_json_scanner;
 
 
-void php_json_scanner_init(php_json_scanner *scanner, char *str, int str_len, long options);
+void php_json_scanner_init(php_json_scanner *scanner, char *str, size_t str_len, int options);
 int php_json_scan(php_json_scanner *s);
 
 #endif	/* PHP_JSON_SCANNER_H */