diff options
| author | Anatol Belski <ab@php.net> | 2014-12-18 10:09:02 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-18 10:09:02 +0100 |
| commit | 4b943c9c0dd4114adc78416c5241f11ad5c98a80 (patch) | |
| tree | c9628d91eae3f580f9ebd73d2372e4c9089b2e00 /ext/mbstring/mbstring.h | |
| parent | 79354ba6d0d6a1a4596f9ac66ee9bc3a34ed972b (diff) | |
| parent | dec8eb431adee340fb8dfb9ff33ed29d3279c35f (diff) | |
| download | php-git-POST_NATIVE_TLS_MERGE.tar.gz | |
Merge remote-tracking branch 'origin/native-tls'POST_NATIVE_TLS_MERGE
Diffstat (limited to 'ext/mbstring/mbstring.h')
| -rw-r--r-- | ext/mbstring/mbstring.h | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/ext/mbstring/mbstring.h b/ext/mbstring/mbstring.h index 0136f8ef7d..7f4b5dbafc 100644 --- a/ext/mbstring/mbstring.h +++ b/ext/mbstring/mbstring.h @@ -131,27 +131,27 @@ PHP_FUNCTION(mb_check_encoding); MBSTRING_API char *php_mb_safe_strrchr_ex(const char *s, unsigned int c, size_t nbytes, const mbfl_encoding *enc); MBSTRING_API char *php_mb_safe_strrchr(const char *s, unsigned int c, - size_t nbytes TSRMLS_DC); + size_t nbytes); MBSTRING_API char * php_mb_convert_encoding(const char *input, size_t length, const char *_to_encoding, const char *_from_encodings, - size_t *output_len TSRMLS_DC); + size_t *output_len); -MBSTRING_API int php_mb_check_encoding_list(const char *encoding_list TSRMLS_DC); +MBSTRING_API int php_mb_check_encoding_list(const char *encoding_list); MBSTRING_API size_t php_mb_mbchar_bytes_ex(const char *s, const mbfl_encoding *enc); -MBSTRING_API size_t php_mb_mbchar_bytes(const char *s TSRMLS_DC); +MBSTRING_API size_t php_mb_mbchar_bytes(const char *s); MBSTRING_API int php_mb_encoding_detector_ex(const char *arg_string, int arg_length, - char *arg_list TSRMLS_DC); + char *arg_list); MBSTRING_API int php_mb_encoding_converter_ex(char **str, int *len, const char *encoding_to, - const char *encoding_from TSRMLS_DC); -MBSTRING_API int php_mb_stripos(int mode, const char *old_haystack, unsigned int old_haystack_len, const char *old_needle, unsigned int old_needle_len, long offset, const char *from_encoding TSRMLS_DC); + const char *encoding_from); +MBSTRING_API int php_mb_stripos(int mode, const char *old_haystack, unsigned int old_haystack_len, const char *old_needle, unsigned int old_needle_len, long offset, const char *from_encoding); /* internal use only */ -int _php_mb_ini_mbstring_internal_encoding_set(const char *new_value, uint new_value_length TSRMLS_DC); +int _php_mb_ini_mbstring_internal_encoding_set(const char *new_value, uint new_value_length); ZEND_BEGIN_MODULE_GLOBALS(mbstring) char *internal_encoding_name; @@ -200,7 +200,8 @@ struct mb_overload_def { }; #ifdef ZTS -#define MBSTRG(v) TSRMG(mbstring_globals_id, zend_mbstring_globals *, v) +#define MBSTRG(v) ZEND_TSRMG(mbstring_globals_id, zend_mbstring_globals *, v) +ZEND_TSRMLS_CACHE_EXTERN; #else #define MBSTRG(v) (mbstring_globals.v) #endif |