diff options
Diffstat (limited to 'ext/intl/php_intl.h')
| -rw-r--r-- | ext/intl/php_intl.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/ext/intl/php_intl.h b/ext/intl/php_intl.h index 7a7112317d..638fdef1ca 100644 --- a/ext/intl/php_intl.h +++ b/ext/intl/php_intl.h @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -30,6 +30,7 @@ #include "collator/collator_sort.h" #include <unicode/ubrk.h> #include "intl_error.h" +#include "Zend/zend_exceptions.h" extern zend_module_entry intl_module_entry; #define phpext_intl_ptr &intl_module_entry @@ -45,18 +46,21 @@ extern zend_module_entry intl_module_entry; #endif ZEND_BEGIN_MODULE_GLOBALS(intl) - zval* current_collator; + zval current_collator; char* default_locale; collator_compare_func_t compare_func; UBreakIterator* grapheme_iterator; intl_error g_error; - long error_level; + zend_long error_level; zend_bool use_exceptions; ZEND_END_MODULE_GLOBALS(intl) /* Macro to access request-wide global variables. */ #ifdef ZTS -#define INTL_G(v) TSRMG(intl_globals_id, zend_intl_globals *, v) +#define INTL_G(v) ZEND_TSRMG(intl_globals_id, zend_intl_globals *, v) +#ifdef COMPILE_DL_INTL +ZEND_TSRMLS_CACHE_EXTERN(); +#endif #else #define INTL_G(v) (intl_globals.v) #endif @@ -69,7 +73,7 @@ PHP_RINIT_FUNCTION(intl); PHP_RSHUTDOWN_FUNCTION(intl); PHP_MINFO_FUNCTION(intl); -const char *intl_locale_get_default( TSRMLS_D ); +const char *intl_locale_get_default( void ); #define PHP_INTL_VERSION "1.1.0" |