Merge remote-tracking branch 'origin/native-tls'POST_NATIVE_TLS_MERGE

4 files changed, 20 insertions, 20 deletions

diff --git a/ext/intl/normalizer/normalizer.c b/ext/intl/normalizer/normalizer.c
index 18c3cedcaf..3a0d526b77 100644
--- a/ext/intl/normalizer/normalizer.c
+++ b/ext/intl/normalizer/normalizer.c
@@ -38,8 +38,8 @@ void normalizer_register_constants( INIT_FUNC_ARGS )
 	}
 
 	#define NORMALIZER_EXPOSE_CONST(x) REGISTER_LONG_CONSTANT(#x, x, CONST_PERSISTENT | CONST_CS)
-	#define NORMALIZER_EXPOSE_CLASS_CONST(x) zend_declare_class_constant_long( Normalizer_ce_ptr, ZEND_STRS( #x ) - 1, NORMALIZER_##x TSRMLS_CC );
-	#define NORMALIZER_EXPOSE_CUSTOM_CLASS_CONST(name, value) zend_declare_class_constant_long( Normalizer_ce_ptr, ZEND_STRS( name ) - 1, value TSRMLS_CC );
+	#define NORMALIZER_EXPOSE_CLASS_CONST(x) zend_declare_class_constant_long( Normalizer_ce_ptr, ZEND_STRS( #x ) - 1, NORMALIZER_##x );
+	#define NORMALIZER_EXPOSE_CUSTOM_CLASS_CONST(name, value) zend_declare_class_constant_long( Normalizer_ce_ptr, ZEND_STRS( name ) - 1, value );
 
 	/* Normalization form constants */
 	NORMALIZER_EXPOSE_CLASS_CONST( NONE );
diff --git a/ext/intl/normalizer/normalizer_class.c b/ext/intl/normalizer/normalizer_class.c
index ccd8be3b29..93a5624663 100644
--- a/ext/intl/normalizer/normalizer_class.c
+++ b/ext/intl/normalizer/normalizer_class.c
@@ -51,14 +51,14 @@ zend_function_entry Normalizer_class_functions[] = {
 /* {{{ normalizer_register_Normalizer_class
  * Initialize 'Normalizer' class
  */
-void normalizer_register_Normalizer_class( TSRMLS_D )
+void normalizer_register_Normalizer_class( void )
 {
 	zend_class_entry ce;
 
 	/* Create and register 'Normalizer' class. */
 	INIT_CLASS_ENTRY( ce, "Normalizer", Normalizer_class_functions );
 	ce.create_object = NULL;
-	Normalizer_ce_ptr = zend_register_internal_class( &ce TSRMLS_CC );
+	Normalizer_ce_ptr = zend_register_internal_class( &ce );
 
 	/* Declare 'Normalizer' class properties. */
 	if( !Normalizer_ce_ptr )
diff --git a/ext/intl/normalizer/normalizer_class.h b/ext/intl/normalizer/normalizer_class.h
index 3ce37fae88..de5a168a45 100644
--- a/ext/intl/normalizer/normalizer_class.h
+++ b/ext/intl/normalizer/normalizer_class.h
@@ -38,6 +38,6 @@ typedef struct {
 #define NORMALIZER_ERROR_CODE(co)   INTL_ERROR_CODE(NORMALIZER_ERROR(co))
 #define NORMALIZER_ERROR_CODE_P(co) &(INTL_ERROR_CODE(NORMALIZER_ERROR(co)))
 
-void normalizer_register_Normalizer_class( TSRMLS_D );
+void normalizer_register_Normalizer_class( void );
 extern zend_class_entry *Normalizer_ce_ptr;
 #endif // #ifndef NORMALIZER_CLASS_H
diff --git a/ext/intl/normalizer/normalizer_normalize.c b/ext/intl/normalizer/normalizer_normalize.c
index d3ac07024b..97163a98c4 100644
--- a/ext/intl/normalizer/normalizer_normalize.c
+++ b/ext/intl/normalizer/normalizer_normalize.c
@@ -50,14 +50,14 @@ PHP_FUNCTION( normalizer_normalize )
 
 	int32_t			size_needed;
 		
-	intl_error_reset( NULL TSRMLS_CC );
+	intl_error_reset( NULL );
 
 	/* Parse parameters. */
-	if( zend_parse_method_parameters( ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "s|l",
+	if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "s|l",
 				&input, &input_len, &form ) == FAILURE )
 	{
 		intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-						 "normalizer_normalize: unable to parse input params", 0 TSRMLS_CC );
+						 "normalizer_normalize: unable to parse input params", 0 );
 
 		RETURN_FALSE;
 	}
@@ -78,7 +78,7 @@ PHP_FUNCTION( normalizer_normalize )
 			break;
 		default:
 			intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-						"normalizer_normalize: illegal normalization form", 0 TSRMLS_CC );
+						"normalizer_normalize: illegal normalization form", 0 );
 			RETURN_FALSE;
 	}
 
@@ -92,10 +92,10 @@ PHP_FUNCTION( normalizer_normalize )
 	if( U_FAILURE( status ) )
 	{
 		/* Set global error code. */
-		intl_error_set_code( NULL, status TSRMLS_CC );
+		intl_error_set_code( NULL, status );
 
 		/* Set error messages. */
-		intl_error_set_custom_msg( NULL, "Error converting input string to UTF-16", 0 TSRMLS_CC );
+		intl_error_set_custom_msg( NULL, "Error converting input string to UTF-16", 0 );
 		if (uinput) {
 			efree( uinput );
 		}
@@ -136,7 +136,7 @@ PHP_FUNCTION( normalizer_normalize )
 		/* Bail out if an unexpected error occurred. */
 		if( U_FAILURE(status)  ) {
 			/* Set error messages. */
-			intl_error_set_custom_msg( NULL,"Error normalizing string", 0 TSRMLS_CC );
+			intl_error_set_custom_msg( NULL,"Error normalizing string", 0 );
 			efree( uret_buf );
 			efree( uinput );
 			RETURN_FALSE;
@@ -154,7 +154,7 @@ PHP_FUNCTION( normalizer_normalize )
 	if( U_FAILURE( status ) )
 	{
 		intl_error_set( NULL, status,
-				"normalizer_normalize: error converting normalized text UTF-8", 0 TSRMLS_CC );
+				"normalizer_normalize: error converting normalized text UTF-8", 0 );
 		RETURN_FALSE;
 	}
 
@@ -183,14 +183,14 @@ PHP_FUNCTION( normalizer_is_normalized )
 		
 	UBool		uret = FALSE;
 		
-	intl_error_reset( NULL TSRMLS_CC );
+	intl_error_reset( NULL );
 
 	/* Parse parameters. */
-	if( zend_parse_method_parameters( ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "s|l",
+	if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "s|l",
 				&input, &input_len, &form) == FAILURE )
 	{
 		intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-				"normalizer_is_normalized: unable to parse input params", 0 TSRMLS_CC );
+				"normalizer_is_normalized: unable to parse input params", 0 );
 
 		RETURN_FALSE;
 	}
@@ -205,7 +205,7 @@ PHP_FUNCTION( normalizer_is_normalized )
 			break;
 		default:
 			intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-						"normalizer_normalize: illegal normalization form", 0 TSRMLS_CC );
+						"normalizer_normalize: illegal normalization form", 0 );
 			RETURN_FALSE;
 	}
 
@@ -220,10 +220,10 @@ PHP_FUNCTION( normalizer_is_normalized )
 	if( U_FAILURE( status ) )
 	{
 		/* Set global error code. */
-		intl_error_set_code( NULL, status TSRMLS_CC );
+		intl_error_set_code( NULL, status );
 
 		/* Set error messages. */
-		intl_error_set_custom_msg( NULL, "Error converting string to UTF-16.", 0 TSRMLS_CC );
+		intl_error_set_custom_msg( NULL, "Error converting string to UTF-16.", 0 );
 		if (uinput) {
 			efree( uinput );
 		}
@@ -239,7 +239,7 @@ PHP_FUNCTION( normalizer_is_normalized )
 	/* Bail out if an unexpected error occurred. */
 	if( U_FAILURE(status)  ) {
 		/* Set error messages. */
-		intl_error_set_custom_msg( NULL,"Error testing if string is the given normalization form.", 0 TSRMLS_CC );
+		intl_error_set_custom_msg( NULL,"Error testing if string is the given normalization form.", 0 );
 		RETURN_FALSE;
 	}