* Refactor zend_multibyte facility.

  Now mbstring.script_encoding is superseded by zend.script_encoding.

1 files changed, 16 insertions, 18 deletions

diff --git a/ext/mbstring/mbstring.h b/ext/mbstring/mbstring.h
index 77f1c9d5ef..6eae92f4d0 100644
--- a/ext/mbstring/mbstring.h
+++ b/ext/mbstring/mbstring.h
@@ -165,25 +165,23 @@ int _php_mb_ini_mbstring_internal_encoding_set(const char *new_value, uint new_v
 ZEND_BEGIN_MODULE_GLOBALS(mbstring)
 	char *internal_encoding_name;
 	enum mbfl_no_language language;
-	enum mbfl_no_encoding internal_encoding;
-	enum mbfl_no_encoding current_internal_encoding;
-	enum mbfl_no_encoding *script_encoding_list;
-	int script_encoding_list_size;
-	enum mbfl_no_encoding http_output_encoding;
-	enum mbfl_no_encoding current_http_output_encoding;
-	enum mbfl_no_encoding http_input_identify;
-	enum mbfl_no_encoding http_input_identify_get;
-	enum mbfl_no_encoding http_input_identify_post;
-	enum mbfl_no_encoding http_input_identify_cookie;
-	enum mbfl_no_encoding http_input_identify_string;
-	enum mbfl_no_encoding *http_input_list;
-	int http_input_list_size;
-	enum mbfl_no_encoding *detect_order_list;
-	int detect_order_list_size;
-	enum mbfl_no_encoding *current_detect_order_list;
-	int current_detect_order_list_size;
+	const mbfl_encoding *internal_encoding;
+	const mbfl_encoding *current_internal_encoding;
+	const mbfl_encoding *http_output_encoding;
+	const mbfl_encoding *current_http_output_encoding;
+	const mbfl_encoding *http_input_identify;
+	const mbfl_encoding *http_input_identify_get;
+	const mbfl_encoding *http_input_identify_post;
+	const mbfl_encoding *http_input_identify_cookie;
+	const mbfl_encoding *http_input_identify_string;
+	const mbfl_encoding **http_input_list;
+	size_t http_input_list_size;
+	const mbfl_encoding **detect_order_list;
+	size_t detect_order_list_size;
+	const mbfl_encoding **current_detect_order_list;
+	size_t current_detect_order_list_size;
 	enum mbfl_no_encoding *default_detect_order_list;
-	int default_detect_order_list_size;
+	size_t default_detect_order_list_size;
 	int filter_illegal_mode;
 	int filter_illegal_substchar;
 	int current_filter_illegal_mode;