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/intl/intl_data.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/intl/intl_data.h')
| -rw-r--r-- | ext/intl/intl_data.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/ext/intl/intl_data.h b/ext/intl/intl_data.h index a7afb36be9..6467d40909 100644 --- a/ext/intl/intl_data.h +++ b/ext/intl/intl_data.h @@ -35,7 +35,7 @@ typedef struct _intl_data { #define INTL_METHOD_INIT_VARS(oclass, obj) \ zval* object = NULL; \ oclass##_object* obj = NULL; \ - intl_error_reset( NULL TSRMLS_CC ); + intl_error_reset( NULL ); #define INTL_DATA_ERROR(obj) (((intl_object *)(obj))->error) #define INTL_DATA_ERROR_P(obj) (&(INTL_DATA_ERROR((obj)))) @@ -43,32 +43,32 @@ typedef struct _intl_data { #define INTL_METHOD_FETCH_OBJECT(oclass, obj) \ obj = Z_##oclass##_P( object ); \ - intl_error_reset( INTL_DATA_ERROR_P(obj) TSRMLS_CC ); \ + intl_error_reset( INTL_DATA_ERROR_P(obj) ); \ /* Check status by error code, if error - exit */ #define INTL_CHECK_STATUS(err, msg) \ - intl_error_set_code( NULL, (err) TSRMLS_CC ); \ + intl_error_set_code( NULL, (err) ); \ if( U_FAILURE((err)) ) \ { \ - intl_error_set_custom_msg( NULL, msg, 0 TSRMLS_CC ); \ + intl_error_set_custom_msg( NULL, msg, 0 ); \ RETURN_FALSE; \ } /* Check status in object, if error - exit */ #define INTL_METHOD_CHECK_STATUS(obj, msg) \ - intl_error_set_code( NULL, INTL_DATA_ERROR_CODE((obj)) TSRMLS_CC ); \ + intl_error_set_code( NULL, INTL_DATA_ERROR_CODE((obj)) ); \ if( U_FAILURE( INTL_DATA_ERROR_CODE((obj)) ) ) \ { \ - intl_errors_set_custom_msg( INTL_DATA_ERROR_P((obj)), msg, 0 TSRMLS_CC ); \ + intl_errors_set_custom_msg( INTL_DATA_ERROR_P((obj)), msg, 0 ); \ RETURN_FALSE; \ } /* Check status, if error - destroy value and exit */ #define INTL_CTOR_CHECK_STATUS(obj, msg) \ - intl_error_set_code( NULL, INTL_DATA_ERROR_CODE((obj)) TSRMLS_CC ); \ + intl_error_set_code( NULL, INTL_DATA_ERROR_CODE((obj)) ); \ if( U_FAILURE( INTL_DATA_ERROR_CODE((obj)) ) ) \ { \ - intl_errors_set_custom_msg( INTL_DATA_ERROR_P((obj)), msg, 0 TSRMLS_CC ); \ + intl_errors_set_custom_msg( INTL_DATA_ERROR_P((obj)), msg, 0 ); \ /* yes, this is ugly, but it alreay is */ \ if (return_value != getThis()) { \ zval_dtor(return_value); \ @@ -96,14 +96,14 @@ typedef struct _intl_data { #define INTL_CHECK_LOCALE_LEN(locale_len) \ if((locale_len) > INTL_MAX_LOCALE_LEN) { \ intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR, \ - "Locale string too long, should be no longer than 80 characters", 0 TSRMLS_CC ); \ + "Locale string too long, should be no longer than 80 characters", 0 ); \ RETURN_NULL(); \ } #define INTL_CHECK_LOCALE_LEN_OBJ(locale_len, object) \ if((locale_len) > INTL_MAX_LOCALE_LEN) { \ intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR, \ - "Locale string too long, should be no longer than 80 characters", 0 TSRMLS_CC ); \ + "Locale string too long, should be no longer than 80 characters", 0 ); \ zval_dtor(object); \ ZVAL_NULL(object); \ RETURN_NULL(); \ |