diff options
author | Moriyoshi Koizumi <moriyoshi@php.net> | 2010-12-19 16:36:37 +0000 |
---|---|---|
committer | Moriyoshi Koizumi <moriyoshi@php.net> | 2010-12-19 16:36:37 +0000 |
commit | bbf3d43c1ee0ad53b03c3821cd630f0746d5e954 (patch) | |
tree | fd11ea79a69ee445ffde8310a3760603bf3df821 /Zend/zend_globals.h | |
parent | c28cac404d2d0590ba2811f41331c60d09adbf1e (diff) | |
download | php-git-bbf3d43c1ee0ad53b03c3821cd630f0746d5e954.tar.gz |
* Refactor zend_multibyte facility.
Now mbstring.script_encoding is superseded by zend.script_encoding.
Diffstat (limited to 'Zend/zend_globals.h')
-rw-r--r-- | Zend/zend_globals.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Zend/zend_globals.h b/Zend/zend_globals.h index 8ec2a88c04..e6b504ebe3 100644 --- a/Zend/zend_globals.h +++ b/Zend/zend_globals.h @@ -147,14 +147,12 @@ struct _zend_compiler_globals { HashTable interned_strings; - zend_encoding **script_encoding_list; + const zend_encoding **script_encoding_list; size_t script_encoding_list_size; zend_bool multibyte; zend_bool detect_unicode; zend_bool encoding_declared; - zend_encoding *internal_encoding; - #ifdef ZTS zval ***static_members_table; int last_static_member; @@ -310,8 +308,7 @@ struct _zend_php_scanner_globals { /* input/ouput filters */ zend_encoding_filter input_filter; zend_encoding_filter output_filter; - zend_encoding *script_encoding; - zend_encoding *internal_encoding; + const zend_encoding *script_encoding; }; #endif /* ZEND_GLOBALS_H */ |