- The tree compiles again

28 files changed, 243 insertions, 243 deletions

diff --git a/ext/standard/array.c b/ext/standard/array.c
index 707684efb8..02a855a5d0 100644
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -202,7 +202,7 @@ PHP_FUNCTION(krsort)
 	pval **array;
 	HashTable *target_hash;
 
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &array) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &array) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	target_hash = HASH_OF(*array);
@@ -221,7 +221,7 @@ PHP_FUNCTION(ksort)
 	pval **array;
 	HashTable *target_hash;
 
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &array) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &array) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	target_hash = HASH_OF(*array);
@@ -241,7 +241,7 @@ PHP_FUNCTION(count)
 	pval **array;
 	HashTable *target_hash;
 
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &array) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &array) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	target_hash = HASH_OF(*array);
@@ -310,7 +310,7 @@ PHP_FUNCTION(asort)
 	pval **array;
 	HashTable *target_hash;
 
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &array) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &array) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	target_hash = HASH_OF(*array);
@@ -329,7 +329,7 @@ PHP_FUNCTION(arsort)
 	pval **array;
 	HashTable *target_hash;
 
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &array) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &array) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	target_hash = HASH_OF(*array);
@@ -348,7 +348,7 @@ PHP_FUNCTION(sort)
 	pval **array;
 	HashTable *target_hash;
 
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &array) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &array) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	target_hash = HASH_OF(*array);
@@ -367,7 +367,7 @@ PHP_FUNCTION(rsort)
 	pval **array;
 	HashTable *target_hash;
 
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &array) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &array) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	target_hash = HASH_OF(*array);
@@ -414,7 +414,7 @@ PHP_FUNCTION(usort)
 	BLS_FETCH();
 
 	old_compare_func = BG(user_compare_func_name);
-	if (ARG_COUNT(ht) != 2 || getParametersEx(2, &array, &BG(user_compare_func_name)) == FAILURE) {
+	if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &array, &BG(user_compare_func_name)) == FAILURE) {
 		BG(user_compare_func_name) = old_compare_func;
 		WRONG_PARAM_COUNT;
 	}
@@ -441,7 +441,7 @@ PHP_FUNCTION(uasort)
 	BLS_FETCH();
 
 	old_compare_func = BG(user_compare_func_name);
-	if (ARG_COUNT(ht) != 2 || getParametersEx(2, &array, &BG(user_compare_func_name)) == FAILURE) {
+	if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &array, &BG(user_compare_func_name)) == FAILURE) {
 		BG(user_compare_func_name) = old_compare_func;
 		WRONG_PARAM_COUNT;
 	}
@@ -519,7 +519,7 @@ PHP_FUNCTION(uksort)
 	BLS_FETCH();
 
 	old_compare_func = BG(user_compare_func_name);
-	if (ARG_COUNT(ht) != 2 || getParametersEx(2, &array, &BG(user_compare_func_name)) == FAILURE) {
+	if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &array, &BG(user_compare_func_name)) == FAILURE) {
 		BG(user_compare_func_name) = old_compare_func;
 		WRONG_PARAM_COUNT;
 	}
@@ -543,7 +543,7 @@ PHP_FUNCTION(end)
 	pval **array, **entry;
 	HashTable *target_hash;
 
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &array) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &array) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	target_hash = HASH_OF(*array);
@@ -569,7 +569,7 @@ PHP_FUNCTION(prev)
 	pval **array, **entry;
 	HashTable *target_hash;
 
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &array) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &array) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	target_hash = HASH_OF(*array);
@@ -595,7 +595,7 @@ PHP_FUNCTION(next)
 	pval **array, **entry;
 	HashTable *target_hash;
 
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &array) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &array) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	target_hash = HASH_OF(*array);
@@ -621,7 +621,7 @@ PHP_FUNCTION(reset)
 	pval **array, **entry;
 	HashTable *target_hash;
 
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &array) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &array) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	target_hash = HASH_OF(*array);
@@ -646,7 +646,7 @@ PHP_FUNCTION(current)
 	pval **array, **entry;
 	HashTable *target_hash;
 
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &array) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &array) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	target_hash = HASH_OF(*array);
@@ -669,7 +669,7 @@ PHP_FUNCTION(key)
 	ulong num_key;
 	HashTable *target_hash;
 
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &array) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &array) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	target_hash = HASH_OF(*array);
@@ -706,7 +706,7 @@ PHP_FUNCTION(min)
 	if (argc == 1) {
 		pval **arr;
 
-		if (getParametersEx(1, &arr) == FAILURE || (*arr)->type != IS_ARRAY) {
+		if (zend_get_parameters_ex(1, &arr) == FAILURE || (*arr)->type != IS_ARRAY) {
 			WRONG_PARAM_COUNT;
 		}
 		if (zend_hash_minmax((*arr)->value.ht, array_data_compare, 0, (void **) &result)==SUCCESS) {
@@ -721,7 +721,7 @@ PHP_FUNCTION(min)
 		pval **min, result;
 		int i;
 
-		if (getParametersArrayEx(ARG_COUNT(ht), args)==FAILURE) {
+		if (zend_get_parameters_array_ex(ARG_COUNT(ht), args)==FAILURE) {
 			efree(args);
 			WRONG_PARAM_COUNT;
 		}
@@ -756,7 +756,7 @@ PHP_FUNCTION(max)
 	if (argc == 1) {
 		pval **arr;
 
-		if (getParametersEx(1, &arr) == FAILURE || (*arr)->type != IS_ARRAY) {
+		if (zend_get_parameters_ex(1, &arr) == FAILURE || (*arr)->type != IS_ARRAY) {
 			WRONG_PARAM_COUNT;
 		}
 		if (zend_hash_minmax((*arr)->value.ht, array_data_compare, 1, (void **) &result)==SUCCESS) {
@@ -771,7 +771,7 @@ PHP_FUNCTION(max)
 		pval **max, result;
 		int i;
 
-		if (getParametersArrayEx(ARG_COUNT(ht), args)==FAILURE) {
+		if (zend_get_parameters_array_ex(ARG_COUNT(ht), args)==FAILURE) {
 			efree(args);
 			WRONG_PARAM_COUNT;
 		}
@@ -849,7 +849,7 @@ PHP_FUNCTION(array_walk) {
 	argc = ARG_COUNT(ht);
 	old_walk_func_name = BG(array_walk_func_name);
 	if (argc < 2 || argc > 3 ||
-		getParametersEx(argc, &array, &BG(array_walk_func_name), &userdata) == FAILURE) {
+		zend_get_parameters_ex(argc, &array, &BG(array_walk_func_name), &userdata) == FAILURE) {
 		BG(array_walk_func_name) = old_walk_func_name;
 		WRONG_PARAM_COUNT;
 	}
@@ -877,7 +877,7 @@ PHP_FUNCTION(in_array)
 		  res;					/* comparison result */
 	HashTable *target_hash;		/* array hashtable */
 
-	if (ARG_COUNT(ht) != 2 || getParametersEx(2, &value, &array) == FAILURE) {
+	if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &value, &array) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	
@@ -947,14 +947,14 @@ PHP_FUNCTION(extract)
 
 	switch(ARG_COUNT(ht)) {
 		case 1:
-			if (getParametersEx(1, &var_array) == FAILURE) {
+			if (zend_get_parameters_ex(1, &var_array) == FAILURE) {
 				WRONG_PARAM_COUNT;
 			}
 			extype = EXTR_OVERWRITE;
 			break;
 
 		case 2:
-			if (getParametersEx(2, &var_array, &etype) == FAILURE) {
+			if (zend_get_parameters_ex(2, &var_array, &etype) == FAILURE) {
 				WRONG_PARAM_COUNT;
 			}
 			convert_to_long_ex(etype);
@@ -965,7 +965,7 @@ PHP_FUNCTION(extract)
 			break;
 			
 		case 3:
-			if (getParametersEx(3, &var_array, &etype, &prefix) == FAILURE) {
+			if (zend_get_parameters_ex(3, &var_array, &etype, &prefix) == FAILURE) {
 				WRONG_PARAM_COUNT;
 			}
 			convert_to_long_ex(etype);
@@ -1084,7 +1084,7 @@ PHP_FUNCTION(compact)
 	
 	args = (zval ***)emalloc(ARG_COUNT(ht) * sizeof(zval **));
 	
-	if (getParametersArrayEx(ARG_COUNT(ht), args) == FAILURE) {
+	if (zend_get_parameters_array_ex(ARG_COUNT(ht), args) == FAILURE) {
 		efree(args);
 		WRONG_PARAM_COUNT;
 	}
@@ -1107,7 +1107,7 @@ PHP_FUNCTION(range)
 	zval **zlow, **zhigh;
 	int low, high;
 	
-	if (ARG_COUNT(ht) != 2 || getParametersEx(2,&zlow,&zhigh) == FAILURE) {
+	if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2,&zlow,&zhigh) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_long_ex(zlow);
@@ -1149,7 +1149,7 @@ PHP_FUNCTION(shuffle)
 {
 	zval **array;
 
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &array) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &array) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	if ((*array)->type != IS_ARRAY) {
@@ -1272,7 +1272,7 @@ PHP_FUNCTION(array_push)
 	
 	/* Allocate arguments array and get the arguments, checking for errors. */
 	args = (zval ***)emalloc(argc * sizeof(zval **));
-	if (getParametersArrayEx(argc, args) == FAILURE) {
+	if (zend_get_parameters_array_ex(argc, args) == FAILURE) {
 		efree(args);
 		WRONG_PARAM_COUNT;
 	}
@@ -1308,7 +1308,7 @@ static void _phpi_pop(INTERNAL_FUNCTION_PARAMETERS, int off_the_end)
 	HashTable	*new_hash;		/* New stack */
 	
 	/* Get the arguments and do error-checking */
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &stack) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &stack) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	
@@ -1376,7 +1376,7 @@ PHP_FUNCTION(array_unshift)
 	
 	/* Allocate arguments array and get the arguments, checking for errors. */
 	args = (zval ***)emalloc(argc * sizeof(zval **));
-	if (getParametersArrayEx(argc, args) == FAILURE) {
+	if (zend_get_parameters_array_ex(argc, args) == FAILURE) {
 		efree(args);
 		WRONG_PARAM_COUNT;
 	}
@@ -1426,7 +1426,7 @@ PHP_FUNCTION(array_splice)
 	
 	/* Allocate arguments array and get the arguments, checking for errors. */
 	args = (zval ***)emalloc(argc * sizeof(zval **));
-	if (getParametersArrayEx(argc, args) == FAILURE) {
+	if (zend_get_parameters_array_ex(argc, args) == FAILURE) {
 		efree(args);
 		WRONG_PARAM_COUNT;
 	}	
@@ -1502,7 +1502,7 @@ PHP_FUNCTION(array_slice)
 
 	/* Get the arguments and do error-checking */	
 	argc = ARG_COUNT(ht);
-	if (argc < 2 || argc > 3 || getParametersEx(argc, &input, &offset, &length)) {
+	if (argc < 2 || argc > 3 || zend_get_parameters_ex(argc, &input, &offset, &length)) {
 		WRONG_PARAM_COUNT;
 	}
 	
@@ -1597,7 +1597,7 @@ PHP_FUNCTION(array_merge)
 	
 	/* Allocate arguments array and get the arguments, checking for errors. */
 	args = (zval ***)emalloc(argc * sizeof(zval **));
-	if (getParametersArrayEx(argc, args) == FAILURE) {
+	if (zend_get_parameters_array_ex(argc, args) == FAILURE) {
 		efree(args);
 		WRONG_PARAM_COUNT;
 	}
@@ -1655,7 +1655,7 @@ PHP_FUNCTION(array_keys)
 	
 	/* Get arguments and do error-checking */
 	if (ARG_COUNT(ht) < 1 || ARG_COUNT(ht) > 2 ||
-		getParametersEx(ARG_COUNT(ht), &input, &search_value) == FAILURE) {
+		zend_get_parameters_ex(ARG_COUNT(ht), &input, &search_value) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	
@@ -1711,7 +1711,7 @@ PHP_FUNCTION(array_values)
 			   **entry;		/* An entry in the input array */
 	
 	/* Get arguments and do error-checking */
-	if (ARG_COUNT(ht) != 1 || getParametersEx(ARG_COUNT(ht), &input) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(ARG_COUNT(ht), &input) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	
@@ -1747,7 +1747,7 @@ PHP_FUNCTION(array_count_values)
 	HashTable   *myht;
 	
 	/* Get arguments and do error-checking */
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &input) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &input) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	
@@ -1808,7 +1808,7 @@ PHP_FUNCTION(array_reverse)
 	ulong		 num_key;
 	
 	/* Get arguments and do error-checking */
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &input) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &input) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	
@@ -1859,7 +1859,7 @@ PHP_FUNCTION(array_pad)
 	int			  i;
 	
 	/* Get arguments and do error-checking */
-	if (ARG_COUNT(ht) != 3 || getParametersEx(3, &input, &pad_size, &pad_value) == FAILURE) {
+	if (ARG_COUNT(ht) != 3 || zend_get_parameters_ex(3, &input, &pad_size, &pad_value) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	
@@ -1916,7 +1916,7 @@ PHP_FUNCTION(array_flip)
 	char *string_key;
 	ulong num_key;
 	
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &array) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &array) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
@@ -2009,7 +2009,7 @@ PHP_FUNCTION(array_multisort)
 	
 	/* Allocate arguments array and get the arguments, checking for errors. */
 	args = (zval ***)emalloc(argc * sizeof(zval **));
-	if (getParametersArrayEx(argc, args) == FAILURE) {
+	if (zend_get_parameters_array_ex(argc, args) == FAILURE) {
 		efree(args);
 		WRONG_PARAM_COUNT;
 	}
diff --git a/ext/standard/assert.c b/ext/standard/assert.c
index 87d5222679..e771e31dca 100644
--- a/ext/standard/assert.c
+++ b/ext/standard/assert.c
@@ -174,7 +174,7 @@ PHP_FUNCTION(assert)
 		RETURN_TRUE;
 	}
 
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &assertion) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &assertion) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
@@ -279,7 +279,7 @@ PHP_FUNCTION(assert_options)
 	int ac = ARG_COUNT(ht);
 	ASSERTLS_FETCH();
 	
-	if (ac < 1 || ac > 2 || getParametersEx(ac, &what, &value) == FAILURE) {
+	if (ac < 1 || ac > 2 || zend_get_parameters_ex(ac, &what, &value) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
diff --git a/ext/standard/base64.c b/ext/standard/base64.c
index 9f95520703..e98cdcccc6 100644
--- a/ext/standard/base64.c
+++ b/ext/standard/base64.c
@@ -146,7 +146,7 @@ PHP_FUNCTION(base64_encode) {
 	unsigned char *result;
 	int ret_length;
 
-	if (ARG_COUNT(ht)!=1 || getParametersEx(1,&string) == FAILURE) {
+	if (ARG_COUNT(ht)!=1 || zend_get_parameters_ex(1,&string) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_string_ex(string);
@@ -169,7 +169,7 @@ PHP_FUNCTION(base64_decode) {
 	unsigned char *result;
 	int ret_length;
 
-	if (ARG_COUNT(ht)!=1 || getParametersEx(1,&string) == FAILURE) {
+	if (ARG_COUNT(ht)!=1 || zend_get_parameters_ex(1,&string) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_string_ex(string);
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index ac918bd858..1328f9c20d 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -445,7 +445,7 @@ PHP_FUNCTION(getenv)
 	SLS_FETCH();
 #endif
 
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &str) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &str) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_string_ex(str);
@@ -494,7 +494,7 @@ PHP_FUNCTION(putenv)
 	pval **str;
 	BLS_FETCH();
 
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &str) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &str) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_string_ex(str);
@@ -547,13 +547,13 @@ PHP_FUNCTION(intval)
 	
 	switch(ARG_COUNT(ht)) {
 	case 1:
-		if (getParametersEx(1, &num) == FAILURE) {
+		if (zend_get_parameters_ex(1, &num) == FAILURE) {
 			WRONG_PARAM_COUNT;
 		}
 		base = 10;
 		break;
 	case 2:
-		if (getParametersEx(2, &num, &arg_base) == FAILURE) {
+		if (zend_get_parameters_ex(2, &num, &arg_base) == FAILURE) {
 			WRONG_PARAM_COUNT;
 		}
 		convert_to_long_ex(arg_base);
@@ -572,7 +572,7 @@ PHP_FUNCTION(doubleval)
 {
 	pval **num;
 
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &num) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &num) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	*return_value=**num;
@@ -585,7 +585,7 @@ PHP_FUNCTION(strval)
 {
 	pval **num;
 
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &num) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &num) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	*return_value=**num;
@@ -622,7 +622,7 @@ PHP_FUNCTION(sleep)
 {
 	pval **num;
 
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &num) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &num) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_long_ex(num);
@@ -634,7 +634,7 @@ PHP_FUNCTION(usleep)
 #if HAVE_USLEEP
 	pval **num;
 
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &num) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &num) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_long_ex(num);
@@ -646,7 +646,7 @@ PHP_FUNCTION(gettype)
 {
 	pval **arg;
 
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	switch ((*arg)->type) {
@@ -694,7 +694,7 @@ PHP_FUNCTION(settype)
 	pval **var, **type;
 	char *new_type;
 
-	if (ARG_COUNT(ht) != 2 || getParametersEx(2, &var, &type) == FAILURE) {
+	if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &var, &type) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_string_ex(type);
@@ -734,7 +734,7 @@ PHP_FUNCTION(get_cfg_var)
 	pval **varname;
 	char *value;
 	
-	if (ARG_COUNT(ht)!=1 || getParametersEx(1, &varname)==FAILURE) {
+	if (ARG_COUNT(ht)!=1 || zend_get_parameters_ex(1, &varname)==FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	
@@ -751,7 +751,7 @@ PHP_FUNCTION(set_magic_quotes_runtime)
 	pval **new_setting;
 	PLS_FETCH();
 	
-	if (ARG_COUNT(ht)!=1 || getParametersEx(1, &new_setting)==FAILURE) {
+	if (ARG_COUNT(ht)!=1 || zend_get_parameters_ex(1, &new_setting)==FAILURE) {
 		RETURN_FALSE;
 	}
 	convert_to_boolean_ex(new_setting);
@@ -779,7 +779,7 @@ void php_is_type(INTERNAL_FUNCTION_PARAMETERS,int type)
 {
 	pval **arg;
 	
-	if (ARG_COUNT(ht)!=1 || getParametersEx(1, &arg)==FAILURE) {
+	if (ARG_COUNT(ht)!=1 || zend_get_parameters_ex(1, &arg)==FAILURE) {
 		RETURN_FALSE;
 	}
 	if ((*arg)->type == type) {
@@ -847,13 +847,13 @@ PHP_FUNCTION(error_log)
 
 	switch(ARG_COUNT(ht)) {
 	case 1:
-		if (getParametersEx(1,&string) == FAILURE) {
+		if (zend_get_parameters_ex(1,&string) == FAILURE) {
 			php_error(E_WARNING,"Invalid argument 1 in error_log");
 			RETURN_FALSE;
 		}
 		break;
 	case 2:
-		if (getParametersEx(2,&string,&erropt) == FAILURE) {
+		if (zend_get_parameters_ex(2,&string,&erropt) == FAILURE) {
 			php_error(E_WARNING,"Invalid arguments in error_log");
 			RETURN_FALSE;
 		}
@@ -861,7 +861,7 @@ PHP_FUNCTION(error_log)
 		opt_err=(*erropt)->value.lval;
 		break;
 	case 3:
-		if (getParametersEx(3,&string,&erropt,&option) == FAILURE){
+		if (zend_get_parameters_ex(3,&string,&erropt,&option) == FAILURE){
 			php_error(E_WARNING,"Invalid arguments in error_log");
 			RETURN_FALSE;
 		}
@@ -871,7 +871,7 @@ PHP_FUNCTION(error_log)
 		opt=(*option)->value.str.val;
 		break;
 	case 4:
-		if (getParametersEx(4,&string,&erropt,&option,&emailhead) == FAILURE){
+		if (zend_get_parameters_ex(4,&string,&erropt,&option,&emailhead) == FAILURE){
 			php_error(E_WARNING,"Invalid arguments in error_log");
 			RETURN_FALSE;
 		}
@@ -952,7 +952,7 @@ PHP_FUNCTION(call_user_func)
 	}
 	params = (pval ***) emalloc(sizeof(pval **)*arg_count);
 	
-	if (getParametersArrayEx(arg_count, params)==FAILURE) {
+	if (zend_get_parameters_array_ex(arg_count, params)==FAILURE) {
 		efree(params);
 		RETURN_FALSE;
 	}
@@ -979,7 +979,7 @@ PHP_FUNCTION(call_user_method)
 	}
 	params = (pval ***) emalloc(sizeof(pval **)*arg_count);
 	
-	if (getParametersArrayEx(arg_count, params)==FAILURE) {
+	if (zend_get_parameters_array_ex(arg_count, params)==FAILURE) {
 		efree(params);
 		RETURN_FALSE;
 	}
@@ -1077,7 +1077,7 @@ PHP_FUNCTION(highlight_file)
 	zend_syntax_highlighter_ini syntax_highlighter_ini;
 
 	
-	if (ARG_COUNT(ht)!=1 || getParametersEx(1, &filename)==FAILURE) {
+	if (ARG_COUNT(ht)!=1 || zend_get_parameters_ex(1, &filename)==FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_string_ex(filename);
@@ -1099,7 +1099,7 @@ PHP_FUNCTION(highlight_string)
 	pval **expr;
 	zend_syntax_highlighter_ini syntax_highlighter_ini;
 	
-	if (ARG_COUNT(ht)!=1 || getParametersEx(1, &expr)==FAILURE) {
+	if (ARG_COUNT(ht)!=1 || zend_get_parameters_ex(1, &expr)==FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	
@@ -1243,7 +1243,7 @@ PHP_FUNCTION(ini_get)
 {
 	pval **varname;
 
-	if (ARG_COUNT(ht)!=1 || getParametersEx(1, &varname)==FAILURE) {
+	if (ARG_COUNT(ht)!=1 || zend_get_parameters_ex(1, &varname)==FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
@@ -1266,7 +1266,7 @@ PHP_FUNCTION(ini_alter)
 	pval **varname, **new_value;
 	char *old_value;
 
-	if (ARG_COUNT(ht)!=2 || getParametersEx(2, &varname, &new_value)==FAILURE) {
+	if (ARG_COUNT(ht)!=2 || zend_get_parameters_ex(2, &varname, &new_value)==FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
@@ -1291,7 +1291,7 @@ PHP_FUNCTION(ini_restore)
 {
 	pval **varname;
 
-	if (ARG_COUNT(ht)!=1 || getParametersEx(1, &varname)==FAILURE) {
+	if (ARG_COUNT(ht)!=1 || zend_get_parameters_ex(1, &varname)==FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
@@ -1305,7 +1305,7 @@ PHP_FUNCTION(print_r)
 {
 	pval **expr;
 
-	if (ARG_COUNT(ht)!=1 || getParametersEx(1, &expr)==FAILURE) {
+	if (ARG_COUNT(ht)!=1 || zend_get_parameters_ex(1, &expr)==FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
@@ -1360,7 +1360,7 @@ PHP_FUNCTION(ignore_user_abort)
         case 0:
             break;
         case 1:
-            if (getParametersEx(1, &arg) == FAILURE) {
+            if (zend_get_parameters_ex(1, &arg) == FAILURE) {
                 RETURN_FALSE;
             }
             convert_to_boolean_ex(arg);
@@ -1381,7 +1381,7 @@ PHP_FUNCTION(getservbyname)
 	pval **name,**proto;  
 	struct servent *serv;
 
-	if(ARG_COUNT(ht) != 2 || getParametersEx(2,&name,&proto) == FAILURE) {
+	if(ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2,&name,&proto) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_string_ex(name);
@@ -1404,7 +1404,7 @@ PHP_FUNCTION(getservbyport)
 	pval **port,**proto;
 	struct servent *serv;
 
-	if(ARG_COUNT(ht) != 2 || getParametersEx(2,&port,&proto) == FAILURE) {
+	if(ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2,&port,&proto) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_long_ex(port);
@@ -1427,7 +1427,7 @@ PHP_FUNCTION(getprotobyname)
 	pval **name;
 	struct protoent *ent;
 
-	if(ARG_COUNT(ht) != 1 || getParametersEx(1, &name) == FAILURE) {
+	if(ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &name) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
@@ -1453,7 +1453,7 @@ PHP_FUNCTION(getprotobynumber)
 	pval **proto;
 	struct protoent *ent;
 
-	if(ARG_COUNT(ht) != 1 || getParametersEx(1, &proto) == FAILURE) {
+	if(ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &proto) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
@@ -1496,7 +1496,7 @@ PHP_FUNCTION(extension_loaded)
 {
 	zval **extension_name;
 
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &extension_name)) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &extension_name)) {
 		WRONG_PARAM_COUNT;
 	}
 
@@ -1518,7 +1518,7 @@ PHP_FUNCTION(get_extension_funcs)
 	zend_module_entry *module;
 	zend_function_entry *func;
 
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &extension_name)) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &extension_name)) {
 		WRONG_PARAM_COUNT;
 	}
 
diff --git a/ext/standard/crypt.c b/ext/standard/crypt.c
index 28f1c3babc..8c5723476c 100644
--- a/ext/standard/crypt.c
+++ b/ext/standard/crypt.c
@@ -129,12 +129,12 @@ PHP_FUNCTION(crypt)
 
 	switch (ARG_COUNT(ht)) {
 		case 1:
-			if (getParametersEx(1, &arg1)==FAILURE) {
+			if (zend_get_parameters_ex(1, &arg1)==FAILURE) {
 				RETURN_FALSE;
 			}
 			break;
 		case 2:
-			if (getParametersEx(2, &arg1, &arg2)==FAILURE) {
+			if (zend_get_parameters_ex(2, &arg1, &arg2)==FAILURE) {
 				RETURN_FALSE;
 			}
 			convert_to_string_ex(arg2);
diff --git a/ext/standard/dir.c b/ext/standard/dir.c
index cbbed77dbd..8d7ffa2a72 100644
--- a/ext/standard/dir.c
+++ b/ext/standard/dir.c
@@ -76,7 +76,7 @@ static zend_class_entry *dir_class_entry_ptr;
 		} else { \
 			ZEND_FETCH_RESOURCE(dirp,php_dir *,0,DIR(default_dir), "Directory", le_dirp); \
 		} \
-	} else if ((ARG_COUNT(ht) != 1) || getParametersEx(1, &id) == FAILURE) { \
+	} else if ((ARG_COUNT(ht) != 1) || zend_get_parameters_ex(1, &id) == FAILURE) { \
 		WRONG_PARAM_COUNT; \
 	} else { \
 		ZEND_FETCH_RESOURCE(dirp,php_dir *,id,-1, "Directory", le_dirp); \
@@ -146,7 +146,7 @@ static void _php_do_opendir(INTERNAL_FUNCTION_PARAMETERS, int createobject)
 	php_dir *dirp;
 	DIRLS_FETCH();
 	
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_string_ex(arg);
@@ -221,7 +221,7 @@ PHP_FUNCTION(chdir)
 	pval **arg;
 	int ret;
 	
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_string_ex(arg);
diff --git a/ext/standard/dl.c b/ext/standard/dl.c
index 8aa0c23d3c..3712fa6333 100644
--- a/ext/standard/dl.c
+++ b/ext/standard/dl.c
@@ -60,7 +60,7 @@ void dl(INTERNAL_FUNCTION_PARAMETERS)
 	PLS_FETCH();
 
 	/* obtain arguments */
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &file) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &file) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
diff --git a/ext/standard/dns.c b/ext/standard/dns.c
index f8ca8f2813..f78726c516 100644
--- a/ext/standard/dns.c
+++ b/ext/standard/dns.c
@@ -57,7 +57,7 @@ PHP_FUNCTION(gethostbyaddr)
 {
 	pval **arg;
 	
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_string_ex(arg);
@@ -96,7 +96,7 @@ PHP_FUNCTION(gethostbyname)
 {
 	pval **arg;
 	
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_string_ex(arg);
@@ -116,7 +116,7 @@ PHP_FUNCTION(gethostbynamel)
 	struct in_addr in;
 	int i;
 
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_string_ex(arg);
@@ -173,14 +173,14 @@ PHP_FUNCTION(checkdnsrr)
 	
 	switch (ARG_COUNT(ht)) {
 	case 1:
-		if (getParametersEx(1, &arg1) == FAILURE) {
+		if (zend_get_parameters_ex(1, &arg1) == FAILURE) {
 			WRONG_PARAM_COUNT;
 		}
 		type = T_MX;
 		convert_to_string_ex(arg1);
 		break;
 	case 2:
-		if (getParametersEx(2, &arg1, &arg2) == FAILURE) {
+		if (zend_get_parameters_ex(2, &arg1, &arg2) == FAILURE) {
 			WRONG_PARAM_COUNT;
 		}
 		convert_to_string_ex(arg1);
diff --git a/ext/standard/file.c b/ext/standard/file.c
index 5a70ddd368..0dae49bb9c 100644
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -346,7 +346,7 @@ PHP_FUNCTION(flock)
     int type, fd, act;
 	void *what;
 	
-    if (ARG_COUNT(ht) != 2 || getParametersEx(2, &arg1, &arg2) == FAILURE) {
+    if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &arg1, &arg2) == FAILURE) {
         WRONG_PARAM_COUNT;
     }
 	
@@ -396,12 +396,12 @@ PHP_FUNCTION(get_meta_tags)
 	/* check args */
 	switch (ARG_COUNT(ht)) {
 	case 1:
-		if (getParametersEx(1,&filename) == FAILURE) {
+		if (zend_get_parameters_ex(1,&filename) == FAILURE) {
 			WRONG_PARAM_COUNT;
 		}
 		break;
 	case 2:
-		if (getParametersEx(2,&filename,&arg2) == FAILURE) {
+		if (zend_get_parameters_ex(2,&filename,&arg2) == FAILURE) {
 			WRONG_PARAM_COUNT;
 		}
 		convert_to_long_ex(arg2);
@@ -526,12 +526,12 @@ PHP_FUNCTION(file)
 	/* check args */
 	switch (ARG_COUNT(ht)) {
 	case 1:
-		if (getParametersEx(1,&filename) == FAILURE) {
+		if (zend_get_parameters_ex(1,&filename) == FAILURE) {
 			WRONG_PARAM_COUNT;
 		}
 		break;
 	case 2:
-		if (getParametersEx(2,&filename,&arg2) == FAILURE) {
+		if (zend_get_parameters_ex(2,&filename,&arg2) == FAILURE) {
 				WRONG_PARAM_COUNT;
 		}
 		convert_to_long_ex(arg2);
@@ -588,7 +588,7 @@ PHP_FUNCTION(tempnam)
 	char *t;
 	char p[64];
 	
-	if (ARG_COUNT(ht) != 2 || getParametersEx(2, &arg1, &arg2) == FAILURE) {
+	if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &arg1, &arg2) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_string_ex(arg1);
@@ -637,12 +637,12 @@ PHP_FUNCTION(fopen)
 	
 	switch(ARG_COUNT(ht)) {
 	case 2:
-		if (getParametersEx(2,&arg1,&arg2) == FAILURE) {
+		if (zend_get_parameters_ex(2,&arg1,&arg2) == FAILURE) {
 			WRONG_PARAM_COUNT;
 		}
 		break;
 	case 3:
-		if (getParametersEx(3,&arg1,&arg2,&arg3) == FAILURE) {
+		if (zend_get_parameters_ex(3,&arg1,&arg2,&arg3) == FAILURE) {
 			WRONG_PARAM_COUNT;
 		}
 		convert_to_long_ex(arg3);
@@ -693,7 +693,7 @@ PHP_FUNCTION(fclose)
 	int type;
 	void *what;
 	
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg1) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg1) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
@@ -716,7 +716,7 @@ PHP_FUNCTION(popen)
 	char *b, buf[1024];
 	PLS_FETCH();
 	
-	if (ARG_COUNT(ht) != 2 || getParametersEx(2, &arg1, &arg2) == FAILURE) {
+	if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &arg1, &arg2) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_string_ex(arg1);
@@ -769,7 +769,7 @@ PHP_FUNCTION(pclose)
 	void *what;
 	FIL_FETCH();
 	
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg1) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg1) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
@@ -792,7 +792,7 @@ PHP_FUNCTION(feof)
 	int socketd=0;
 	void *what;
 	
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg1) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg1) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	what = zend_fetch_resource(arg1,-1,"File-Handle",&type,3,le_fopen,le_popen,le_socket);
@@ -850,7 +850,7 @@ PHP_FUNCTION(set_socket_blocking)
 	int socketd = 0;
 	void *what;
 	
-	if (ARG_COUNT(ht) != 2 || getParametersEx(2, &arg1, &arg2) == FAILURE) {
+	if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &arg1, &arg2) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
@@ -915,7 +915,7 @@ PHP_FUNCTION(fgets)
 	void *what;
 	PLS_FETCH();
 	
-	if (ARG_COUNT(ht) != 2 || getParametersEx(2, &arg1, &arg2) == FAILURE) {
+	if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &arg1, &arg2) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
@@ -958,7 +958,7 @@ PHP_FUNCTION(fgetc) {
 	int socketd=0;
 	void *what;
 	
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg1) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg1) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
@@ -998,12 +998,12 @@ PHP_FUNCTION(fgetss)
 
 	switch(ARG_COUNT(ht)) {
 	case 2:
-		if (getParametersEx(2, &fd, &bytes) == FAILURE) {
+		if (zend_get_parameters_ex(2, &fd, &bytes) == FAILURE) {
 			RETURN_FALSE;
 		}
 		break;
 	case 3:
-		if (getParametersEx(3, &fd, &bytes, &allow) == FAILURE) {
+		if (zend_get_parameters_ex(3, &fd, &bytes, &allow) == FAILURE) {
 			RETURN_FALSE;
 		}
 		convert_to_string_ex(allow);
@@ -1055,14 +1055,14 @@ PHP_FUNCTION(fwrite)
 
 	switch (ARG_COUNT(ht)) {
 	case 2:
-		if (getParametersEx(2, &arg1, &arg2)==FAILURE) {
+		if (zend_get_parameters_ex(2, &arg1, &arg2)==FAILURE) {
 			RETURN_FALSE;
 		}
 		convert_to_string_ex(arg2);
 		num_bytes = (*arg2)->value.str.len;
 		break;
 	case 3:
-		if (getParametersEx(3, &arg1, &arg2, &arg3)==FAILURE) {
+		if (zend_get_parameters_ex(3, &arg1, &arg2, &arg3)==FAILURE) {
 			RETURN_FALSE;
 		}
 		convert_to_string_ex(arg2);
@@ -1108,7 +1108,7 @@ PHP_FUNCTION(set_file_buffer)
       
 	switch (ARG_COUNT(ht)) {
 	case 2:
-		if (getParametersEx(2, &arg1, &arg2)==FAILURE) {
+		if (zend_get_parameters_ex(2, &arg1, &arg2)==FAILURE) {
 			RETURN_FALSE;
 		} 
 		break;
@@ -1143,7 +1143,7 @@ PHP_FUNCTION(rewind)
 	pval **arg1;
 	void *what;
 	
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg1) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg1) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	
@@ -1163,7 +1163,7 @@ PHP_FUNCTION(ftell)
 	pval **arg1;
 	void *what;
 	
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg1) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg1) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	
@@ -1182,7 +1182,7 @@ PHP_FUNCTION(fseek)
 	pval **arg1, **arg2;
 	void *what;
 	
-	if (ARG_COUNT(ht) != 2 || getParametersEx(2, &arg1, &arg2) == FAILURE) {
+	if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &arg1, &arg2) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	
@@ -1204,7 +1204,7 @@ PHP_FUNCTION(mkdir)
 	int ret,mode;
 	PLS_FETCH();
 	
-	if (ARG_COUNT(ht) != 2 || getParametersEx(2, &arg1, &arg2) == FAILURE) {
+	if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &arg1, &arg2) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_string_ex(arg1);
@@ -1231,7 +1231,7 @@ PHP_FUNCTION(rmdir)
 	int ret;
 	PLS_FETCH();
 	
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg1) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg1) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_string_ex(arg1);
@@ -1307,12 +1307,12 @@ PHP_FUNCTION(readfile)
 	/* check args */
 	switch (ARG_COUNT(ht)) {
 	case 1:
-		if (getParametersEx(1,&arg1) == FAILURE) {
+		if (zend_get_parameters_ex(1,&arg1) == FAILURE) {
 			WRONG_PARAM_COUNT;
 		}
 		break;
 	case 2:
-		if (getParametersEx(2,&arg1,&arg2) == FAILURE) {
+		if (zend_get_parameters_ex(2,&arg1,&arg2) == FAILURE) {
 			WRONG_PARAM_COUNT;
 		}
 		convert_to_long_ex(arg2);
@@ -1363,7 +1363,7 @@ PHP_FUNCTION(umask)
 	if (arg_count == 0) {
 		umask(oldumask);
 	} else {
-		if (arg_count > 1 || getParametersEx(1, &arg1) == FAILURE) {
+		if (arg_count > 1 || zend_get_parameters_ex(1, &arg1) == FAILURE) {
 			WRONG_PARAM_COUNT;
 		}
 		convert_to_long_ex(arg1);
@@ -1387,7 +1387,7 @@ PHP_FUNCTION(fpassthru)
 	int socketd=0;
 	void *what;
 	
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg1) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg1) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
@@ -1419,7 +1419,7 @@ PHP_FUNCTION(rename)
 	int ret;
 	PLS_FETCH();
 	
-	if (ARG_COUNT(ht) != 2 || getParametersEx(2, &old_arg, &new_arg) == FAILURE) {
+	if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &old_arg, &new_arg) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
@@ -1453,7 +1453,7 @@ PHP_FUNCTION(copy)
 	int fd_s,fd_t,read_bytes;
 	PLS_FETCH();
 	
-	if (ARG_COUNT(ht) != 2 || getParametersEx(2, &source, &target) == FAILURE) {
+	if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &source, &target) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
@@ -1510,7 +1510,7 @@ PHP_FUNCTION(fread)
 	void *what;
 	PLS_FETCH();
 	
-	if (ARG_COUNT(ht) != 2 || getParametersEx(2, &arg1, &arg2) == FAILURE) {
+	if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &arg1, &arg2) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
@@ -1559,13 +1559,13 @@ PHP_FUNCTION(fgetcsv) {
 	
 	switch(ARG_COUNT(ht)) {
 	case 2:
-		if (getParametersEx(2, &fd, &bytes) == FAILURE) {
+		if (zend_get_parameters_ex(2, &fd, &bytes) == FAILURE) {
 			WRONG_PARAM_COUNT;
 		}
 		break;
 		
 	case 3:
-		if (getParametersEx(3, &fd, &bytes, &p_delim) == FAILURE) {
+		if (zend_get_parameters_ex(3, &fd, &bytes, &p_delim) == FAILURE) {
 			WRONG_PARAM_COUNT;
 		}
 		convert_to_string_ex(p_delim);
@@ -1686,7 +1686,7 @@ PHP_FUNCTION(fd_set)
                 return;
         }
         else if(ARG_COUNT(ht) == 1) {
-                if(getParametersEx(1, &arg) == FAILURE) {
+                if(zend_get_parameters_ex(1, &arg) == FAILURE) {
                         WRONG_PARAM_COUNT;
                 }
         what = zend_fetch_resource(arg,-1,"select",&type,3,le_fopen,le_socket,le_popen);
@@ -1703,7 +1703,7 @@ PHP_FUNCTION(fd_set)
         else {
                 pval ***args = (pval ***) emalloc(sizeof(pval **) * ARG_COUNT(ht));
                 int i;
-                if(getParametersArrayEx(ARG_COUNT(ht), args) == FAILURE) {
+                if(zend_get_parameters_array_ex(ARG_COUNT(ht), args) == FAILURE) {
                         efree(args);
                         WRONG_PARAM_COUNT;
                 }
@@ -1729,7 +1729,7 @@ PHP_FUNCTION(select)
 	pval **timeout;
 	struct timeval tv;
 
-	if(ARG_COUNT(ht) != 1 || getParametersEx(1, &timeout) == FAILURE) {
+	if(ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &timeout) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
@@ -1747,7 +1747,7 @@ PHP_FUNCTION(fd_isset)
 	void *what;
 	int type, fd;
 
-	if(ARG_COUNT(ht) != 1 || getParametersEx(1, &fdarg) == FAILURE) {
+	if(ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &fdarg) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
diff --git a/ext/standard/formatted_print.c b/ext/standard/formatted_print.c
index 270c6520ed..f7834233d0 100644
--- a/ext/standard/formatted_print.c
+++ b/ext/standard/formatted_print.c
@@ -378,7 +378,7 @@ php_formatted_print(int ht, int *len)
 	}
 	args = (pval ***)emalloc(argc * sizeof(pval *));
 
-	if (getParametersArrayEx(argc, args) == FAILURE) {
+	if (zend_get_parameters_array_ex(argc, args) == FAILURE) {
 		efree(args);
 		WRONG_PARAM_COUNT_WITH_RETVAL(NULL);
 	}
diff --git a/ext/standard/html.c b/ext/standard/html.c
index 3063129503..6e12625601 100644
--- a/ext/standard/html.c
+++ b/ext/standard/html.c
@@ -50,7 +50,7 @@ static void php_html_entities(INTERNAL_FUNCTION_PARAMETERS, int all)
     unsigned char *old;
 	char *new;
 
-    if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg) == FAILURE) {
+    if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) {
 		WRONG_PARAM_COUNT;
     }
 
@@ -131,7 +131,7 @@ PHP_FUNCTION(get_html_translation_table)
 	int inx;
 	char ind[ 2 ];
 
-	if (ac < 0 || ac > 1 || getParametersEx(ac, &whichone) == FAILURE) {
+	if (ac < 0 || ac > 1 || zend_get_parameters_ex(ac, &whichone) == FAILURE) {
         WRONG_PARAM_COUNT;
     }
 
diff --git a/ext/standard/image.c b/ext/standard/image.c
index cec79148a6..5f5f3bf25a 100644
--- a/ext/standard/image.c
+++ b/ext/standard/image.c
@@ -306,14 +306,14 @@ PHP_FUNCTION(getimagesize)
 	
 	switch(ARG_COUNT(ht)){
 	case 1:
-		if (getParametersEx(1, &arg1) == FAILURE) {
+		if (zend_get_parameters_ex(1, &arg1) == FAILURE) {
 			WRONG_PARAM_COUNT;
 		}
 		convert_to_string_ex(arg1);
 		break;
 
 	case 2:
-		if (getParametersEx(2, &arg1, &info) == FAILURE) {
+		if (zend_get_parameters_ex(2, &arg1, &info) == FAILURE) {
 			WRONG_PARAM_COUNT;
 		}
 		if (!ParameterPassedByReference(ht, 2)) {
diff --git a/ext/standard/info.c b/ext/standard/info.c
index 4d4974b6d5..fcc350756b 100644
--- a/ext/standard/info.c
+++ b/ext/standard/info.c
@@ -452,7 +452,7 @@ PHP_FUNCTION(phpinfo)
 			flag = 0xFFFFFFFF;
 			break;
 		case 1:
-			if (getParametersEx(1, &flag_arg)==FAILURE) {
+			if (zend_get_parameters_ex(1, &flag_arg)==FAILURE) {
 				RETURN_FALSE;
 			}
 			convert_to_long_ex(flag_arg);
@@ -491,7 +491,7 @@ PHP_FUNCTION(phpcredits)
 			flag = 0xFFFFFFFF;
 			break;
 		case 1:
-			if (getParametersEx(1, &flag_arg)==FAILURE) {
+			if (zend_get_parameters_ex(1, &flag_arg)==FAILURE) {
 				RETURN_FALSE;
 			}
 			convert_to_long_ex(flag_arg);
diff --git a/ext/standard/iptc.c b/ext/standard/iptc.c
index 9fbf33f8fc..88922be658 100644
--- a/ext/standard/iptc.c
+++ b/ext/standard/iptc.c
@@ -173,7 +173,7 @@ PHP_FUNCTION(iptcembed)
 
     switch(ARG_COUNT(ht)){
     case 3:
-        if (getParametersEx(3, &iptcdata, &jpeg_file, &spool_flag) == FAILURE) {
+        if (zend_get_parameters_ex(3, &iptcdata, &jpeg_file, &spool_flag) == FAILURE) {
             WRONG_PARAM_COUNT;
         }
         convert_to_string_ex(iptcdata);
@@ -183,7 +183,7 @@ PHP_FUNCTION(iptcembed)
         break;
 
     case 2:
-        if (getParametersEx(2, &iptcdata, &jpeg_file) == FAILURE) {
+        if (zend_get_parameters_ex(2, &iptcdata, &jpeg_file) == FAILURE) {
             WRONG_PARAM_COUNT;
         }
         convert_to_string_ex(iptcdata);
@@ -303,7 +303,7 @@ PHP_FUNCTION(iptcparse)
 	unsigned char key[ 16 ];
 	zval *values, **str, **element;
 
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &str) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &str) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_string_ex(str);
diff --git a/ext/standard/link.c b/ext/standard/link.c
index 1acbcdc4c4..ca061ba9c0 100644
--- a/ext/standard/link.c
+++ b/ext/standard/link.c
@@ -57,7 +57,7 @@ PHP_FUNCTION(readlink)
 	char buff[256];
 	int ret;
 
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &filename) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &filename) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_string_ex(filename);
@@ -83,7 +83,7 @@ PHP_FUNCTION(linkinfo)
 	struct stat sb;
 	int ret;
 
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &filename) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &filename) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_string_ex(filename);
@@ -107,7 +107,7 @@ PHP_FUNCTION(symlink)
 	int ret;
 	PLS_FETCH();
 
-	if (ARG_COUNT(ht) != 2 || getParametersEx(2, &topath, &frompath) == FAILURE) {
+	if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &topath, &frompath) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_string_ex(topath);
@@ -140,7 +140,7 @@ PHP_FUNCTION(link)
 	int ret;
 	PLS_FETCH();
 
-	if (ARG_COUNT(ht) != 2 || getParametersEx(2, &topath, &frompath) == FAILURE) {
+	if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &topath, &frompath) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_string_ex(topath);
@@ -172,7 +172,7 @@ PHP_FUNCTION(unlink)
 	int ret;
 	PLS_FETCH();
 	
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &filename) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &filename) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_string_ex(filename);
diff --git a/ext/standard/mail.c b/ext/standard/mail.c
index 7ff1e584a9..376db3874d 100644
--- a/ext/standard/mail.c
+++ b/ext/standard/mail.c
@@ -62,7 +62,7 @@ PHP_FUNCTION(mail)
 	int argc;
 	
 	argc = ARG_COUNT(ht);
-	if (argc < 3 || argc > 4 || getParametersArrayEx(argc, argv) == FAILURE) {
+	if (argc < 3 || argc > 4 || zend_get_parameters_array_ex(argc, argv) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	/* To: */
diff --git a/ext/standard/math.c b/ext/standard/math.c
index 0ab4fbc16c..9176c11d66 100644
--- a/ext/standard/math.c
+++ b/ext/standard/math.c
@@ -39,7 +39,7 @@ PHP_FUNCTION(abs)
 {
 	zval **value;
 	
-	if (ARG_COUNT(ht)!=1||getParametersEx(1,&value)==FAILURE) {
+	if (ARG_COUNT(ht)!=1||zend_get_parameters_ex(1,&value)==FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
@@ -62,7 +62,7 @@ PHP_FUNCTION(ceil)
 {
 	zval **value;
 	
-	if (ARG_COUNT(ht)!=1||getParametersEx(1,&value)==FAILURE) {
+	if (ARG_COUNT(ht)!=1||zend_get_parameters_ex(1,&value)==FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
@@ -84,7 +84,7 @@ PHP_FUNCTION(ceil)
 PHP_FUNCTION(floor) {
 	zval **value;
 	
-	if (ARG_COUNT(ht)!=1||getParametersEx(1,&value)==FAILURE) {
+	if (ARG_COUNT(ht)!=1||zend_get_parameters_ex(1,&value)==FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
@@ -121,7 +121,7 @@ PHP_FUNCTION(round)
 {
 	zval **value;
 
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &value) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &value) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
@@ -143,7 +143,7 @@ PHP_FUNCTION(sin)
 {
 	zval **num;
 
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &num) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &num) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_double_ex(num);
@@ -159,7 +159,7 @@ PHP_FUNCTION(cos)
 {
 	zval **num;
 
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &num) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &num) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_double_ex(num);
@@ -173,7 +173,7 @@ PHP_FUNCTION(tan)
 {
 	zval **num;
 
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &num) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &num) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_double_ex(num);
@@ -189,7 +189,7 @@ PHP_FUNCTION(asin)
 {
 	zval **num;
 
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &num) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &num) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_double_ex(num);
@@ -205,7 +205,7 @@ PHP_FUNCTION(acos)
 {
 	zval **num;
 
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &num) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &num) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_double_ex(num);
@@ -221,7 +221,7 @@ PHP_FUNCTION(atan)
 {
 	zval **num;
 
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &num) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &num) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_double_ex(num);
@@ -237,7 +237,7 @@ PHP_FUNCTION(atan2)
 {
 	zval **num1, **num2;
 
-	if (ARG_COUNT(ht) != 2 || getParametersEx(2, &num1, &num2) == FAILURE) {
+	if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &num1, &num2) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_double_ex(num1);
@@ -264,7 +264,7 @@ PHP_FUNCTION(pow)
 {
 	zval **num1, **num2;
 	
-	if (ARG_COUNT(ht) != 2 || getParametersEx(2,&num1,&num2) == FAILURE) {
+	if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2,&num1,&num2) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_double_ex(num1);
@@ -280,7 +280,7 @@ PHP_FUNCTION(exp)
 {
 	zval **num;
 
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &num) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &num) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_double_ex(num);
@@ -296,7 +296,7 @@ PHP_FUNCTION(log)
 {
 	zval **num;
 
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &num) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &num) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_double_ex(num);
@@ -312,7 +312,7 @@ PHP_FUNCTION(log10)
 {
 	zval **num;
 
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &num) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &num) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_double_ex(num);
@@ -328,7 +328,7 @@ PHP_FUNCTION(sqrt)
 {
 	zval **num;
 
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &num) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &num) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_double_ex(num);
@@ -344,7 +344,7 @@ PHP_FUNCTION(deg2rad)
 {
 	zval **deg;
 
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &deg) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &deg) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_double_ex(deg);
@@ -359,7 +359,7 @@ PHP_FUNCTION(rad2deg)
 {
 	zval **rad;
 
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &rad) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &rad) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_double_ex(rad);
@@ -452,7 +452,7 @@ PHP_FUNCTION(bindec)
 	zval **arg;
 	long ret;
 	
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
@@ -471,7 +471,7 @@ PHP_FUNCTION(hexdec)
 	zval **arg;
 	long ret;
 	
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
@@ -490,7 +490,7 @@ PHP_FUNCTION(octdec)
 	zval **arg;
 	long ret;
 	
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
@@ -509,7 +509,7 @@ PHP_FUNCTION(decbin)
 	zval **arg;
 	char *result;
 
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
@@ -530,7 +530,7 @@ PHP_FUNCTION(decoct)
 	zval **arg;
 	char *result;
 
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
@@ -551,7 +551,7 @@ PHP_FUNCTION(dechex)
 	zval **arg;
 	char *result;
 
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
@@ -573,7 +573,7 @@ PHP_FUNCTION(base_convert)
 	zval **number, **frombase, **tobase, temp;
 	char *result;
 
-	if (ARG_COUNT(ht) != 3 || getParametersEx(3, &number, &frombase, &tobase) == FAILURE) {
+	if (ARG_COUNT(ht) != 3 || zend_get_parameters_ex(3, &number, &frombase, &tobase) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_string_ex(number);
@@ -667,14 +667,14 @@ PHP_FUNCTION(number_format)
 	
 	switch(ARG_COUNT(ht)) {
 	case 1:
-		if (getParametersEx(1, &num)==FAILURE) {
+		if (zend_get_parameters_ex(1, &num)==FAILURE) {
 			RETURN_FALSE;
 		}
 		convert_to_double_ex(num);
 		RETURN_STRING(_php_math_number_format((*num)->value.dval,0,dec_point,thousand_sep),0);
 		break;
 	case 2:
-		if (getParametersEx(2, &num, &dec)==FAILURE) {
+		if (zend_get_parameters_ex(2, &num, &dec)==FAILURE) {
 			RETURN_FALSE;
 		}
 		convert_to_double_ex(num);
@@ -682,7 +682,7 @@ PHP_FUNCTION(number_format)
 		RETURN_STRING(_php_math_number_format((*num)->value.dval,(*dec)->value.lval,dec_point,thousand_sep),0);
 		break;
 	case 4:
-		if (getParametersEx(4, &num, &dec, &d_p, &t_s)==FAILURE) {
+		if (zend_get_parameters_ex(4, &num, &dec, &d_p, &t_s)==FAILURE) {
 			RETURN_FALSE;
 		}
 		convert_to_double_ex(num);
diff --git a/ext/standard/md5.c b/ext/standard/md5.c
index e89e177d37..2f4d7caddc 100644
--- a/ext/standard/md5.c
+++ b/ext/standard/md5.c
@@ -36,7 +36,7 @@ PHP_NAMED_FUNCTION(php_if_md5)
 	int i;
 	char *r;
 	
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_string_ex(arg);
diff --git a/ext/standard/metaphone.c b/ext/standard/metaphone.c
index 17aec1ece2..c01d6c79e4 100644
--- a/ext/standard/metaphone.c
+++ b/ext/standard/metaphone.c
@@ -51,10 +51,10 @@ PHP_FUNCTION(metaphone)
 	char *result = 0;
 	int phones = 0;
 
-	if (getParametersEx(2, &pstr, &pphones) == SUCCESS) {
+	if (zend_get_parameters_ex(2, &pstr, &pphones) == SUCCESS) {
 		convert_to_long_ex(pphones);
 		phones = (*pphones)->value.lval;
-	} else if (getParametersEx(1, &pstr) == FAILURE) {
+	} else if (zend_get_parameters_ex(1, &pstr) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
diff --git a/ext/standard/microtime.c b/ext/standard/microtime.c
index 1eec292e18..847565e603 100644
--- a/ext/standard/microtime.c
+++ b/ext/standard/microtime.c
@@ -97,7 +97,7 @@ PHP_FUNCTION(getrusage)
 	int who = RUSAGE_SELF;
 
 	if(ac == 1 &&
-		getParametersEx(ac, &pwho) != FAILURE) {
+		zend_get_parameters_ex(ac, &pwho) != FAILURE) {
 		convert_to_long_ex(pwho);
 		if((*pwho)->value.lval == 1)
 			who = RUSAGE_CHILDREN;
diff --git a/ext/standard/rand.c b/ext/standard/rand.c
index a5667595f2..fae8f7e01e 100644
--- a/ext/standard/rand.c
+++ b/ext/standard/rand.c
@@ -193,7 +193,7 @@ PHP_FUNCTION(srand)
 {
 	pval **arg;
 
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_long_ex(arg);
@@ -216,7 +216,7 @@ PHP_FUNCTION(mt_srand)
 	pval **arg;
 	BLS_FETCH();
 
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_long_ex(arg);
@@ -234,7 +234,7 @@ PHP_FUNCTION(rand)
 		case 0:
 			break;
 		case 2:
-			if (getParametersEx(2, &p_min, &p_max)==FAILURE) {
+			if (zend_get_parameters_ex(2, &p_min, &p_max)==FAILURE) {
 				RETURN_FALSE;
 			}
 			convert_to_long_ex(p_min);
@@ -300,7 +300,7 @@ PHP_FUNCTION(mt_rand)
 		case 0:
 			break;
 		case 2:
-			if (getParametersEx(2, &p_min, &p_max)==FAILURE) {
+			if (zend_get_parameters_ex(2, &p_min, &p_max)==FAILURE) {
 				RETURN_FALSE;
 			}
 			convert_to_long_ex(p_min);
diff --git a/ext/standard/reg.c b/ext/standard/reg.c
index 39107fa83b..5f5449a2f8 100644
--- a/ext/standard/reg.c
+++ b/ext/standard/reg.c
@@ -193,7 +193,7 @@ static void php_ereg(INTERNAL_FUNCTION_PARAMETERS, int icase)
 
 	switch(ARG_COUNT(ht)) {
 	case 2:
-		if (getParametersEx(2, &regex, &findin) == FAILURE) {
+		if (zend_get_parameters_ex(2, &regex, &findin) == FAILURE) {
 			WRONG_PARAM_COUNT;
 		}
 		/* don't bother doing substring matching if we're not going
@@ -201,7 +201,7 @@ static void php_ereg(INTERNAL_FUNCTION_PARAMETERS, int icase)
 		copts |= REG_NOSUB;
 		break;
 	case 3:
-		if (getParametersEx(3, &regex, &findin, &array) == FAILURE) {
+		if (zend_get_parameters_ex(3, &regex, &findin, &array) == FAILURE) {
 			WRONG_PARAM_COUNT;
 		}
 		if (!ParameterPassedByReference(ht, 3)) {
@@ -445,7 +445,7 @@ static void php_ereg_replace(INTERNAL_FUNCTION_PARAMETERS, int icase)
 	char *replace;
 	char *ret;
 	
-	if (ARG_COUNT(ht) != 3 || getParametersEx(3, &arg_pattern, &arg_replace, &arg_string) == FAILURE) {
+	if (ARG_COUNT(ht) != 3 || zend_get_parameters_ex(3, &arg_pattern, &arg_replace, &arg_string) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
@@ -522,12 +522,12 @@ PHP_FUNCTION(split)
 	
 	switch (ARG_COUNT(ht)) {
 	case 2:
-		if (getParametersEx(2, &spliton, &str) == FAILURE)
+		if (zend_get_parameters_ex(2, &spliton, &str) == FAILURE)
 			WRONG_PARAM_COUNT;
 		count = -1;
 		break;
 	case 3:
-		if (getParametersEx(3, &spliton, &str, &arg_count) == FAILURE)
+		if (zend_get_parameters_ex(3, &spliton, &str, &arg_count) == FAILURE)
 			WRONG_PARAM_COUNT;
 		convert_to_long_ex(arg_count);
 		count = (*arg_count)->value.lval;
@@ -616,7 +616,7 @@ PHPAPI PHP_FUNCTION(sql_regcase)
 	unsigned char c;
 	register int i, j;
 	
-	if (ARG_COUNT(ht)!=1 || getParametersEx(1, &string)==FAILURE) {
+	if (ARG_COUNT(ht)!=1 || zend_get_parameters_ex(1, &string)==FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	
diff --git a/ext/standard/soundex.c b/ext/standard/soundex.c
index 25946e4854..22bc35d974 100644
--- a/ext/standard/soundex.c
+++ b/ext/standard/soundex.c
@@ -61,7 +61,7 @@ PHP_FUNCTION(soundex)
 	 0,							/* Y */
 	 '2'};						/* Z */
 
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &parg) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &parg) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_string_ex(parg);
diff --git a/ext/standard/string.c b/ext/standard/string.c
index dd17577083..1be4980757 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -66,7 +66,7 @@ PHP_FUNCTION(bin2hex)
 	char *new;
 	size_t newlen;
 
-	if(ARG_COUNT(ht) != 1 || getParametersEx(1, &data) == FAILURE) {
+	if(ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &data) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
@@ -88,7 +88,7 @@ PHP_FUNCTION(strspn)
 {
 	zval **s1,**s2;
 	
-	if (ARG_COUNT(ht)!=2 || getParametersEx(2, &s1, &s2) == FAILURE) {
+	if (ARG_COUNT(ht)!=2 || zend_get_parameters_ex(2, &s1, &s2) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_string_ex(s1);
@@ -105,7 +105,7 @@ PHP_FUNCTION(strcspn)
 {
 	zval **s1,**s2;
 	
-	if (ARG_COUNT(ht)!=2 || getParametersEx(2, &s1, &s2) == FAILURE) {
+	if (ARG_COUNT(ht)!=2 || zend_get_parameters_ex(2, &s1, &s2) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_string_ex(s1);
@@ -162,7 +162,7 @@ PHP_FUNCTION(chop)
 {
 	pval **str;
 	
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &str) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &str) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_string_ex(str);
@@ -181,7 +181,7 @@ PHP_FUNCTION(trim)
 {
 	pval **str;
 	
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &str) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &str) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_string_ex(str);
@@ -200,7 +200,7 @@ PHP_FUNCTION(ltrim)
 {
 	pval **str;
 	
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &str) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &str) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_string_ex(str);
@@ -242,7 +242,7 @@ PHP_FUNCTION(explode)
 {
 	pval **str, **delim;
 
-	if (ARG_COUNT(ht) != 2 || getParametersEx(2, &delim, &str) == FAILURE) {
+	if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &delim, &str) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
@@ -311,7 +311,7 @@ PHP_FUNCTION(implode)
 {
 	pval **arg1, **arg2, *delim, *arr;
 	
-	if (ARG_COUNT(ht) != 2 || getParametersEx(2, &arg1, &arg2) == FAILURE) {
+	if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &arg1, &arg2) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
@@ -346,8 +346,8 @@ PHP_FUNCTION(strtok)
 	
 	argc = ARG_COUNT(ht);
 
-	if ((argc == 1 && getParametersEx(1, &tok) == FAILURE) ||
-		(argc == 2 && getParametersEx(2, &str, &tok) == FAILURE) ||
+	if ((argc == 1 && zend_get_parameters_ex(1, &tok) == FAILURE) ||
+		(argc == 2 && zend_get_parameters_ex(2, &str, &tok) == FAILURE) ||
 		argc < 1 || argc > 2) {
 		WRONG_PARAM_COUNT;
 	}
@@ -412,7 +412,7 @@ PHP_FUNCTION(strtoupper)
 {
 	pval **arg;
 	
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg)) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg)) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_string_ex(arg);
@@ -445,7 +445,7 @@ PHP_FUNCTION(strtolower)
 	pval **str;
 	char *ret;
 	
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &str)) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &str)) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_string_ex(str);
@@ -463,7 +463,7 @@ PHP_FUNCTION(basename)
 	pval **str;
 	char *ret, *c;
 	
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &str)) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &str)) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_string_ex(str);
@@ -515,7 +515,7 @@ PHP_FUNCTION(dirname)
 	pval **str;
 	char *ret;
 	
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &str)) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &str)) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_string_ex(str);
@@ -574,7 +574,7 @@ PHP_FUNCTION(stristr)
 	char *found = NULL;
 	char needle_char[2];
 	
-	if (ARG_COUNT(ht) != 2 || getParametersEx(2, &haystack, &needle) ==
+	if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &haystack, &needle) ==
 		FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
@@ -612,7 +612,7 @@ PHP_FUNCTION(strstr)
 	char *found = NULL;
 	char needle_char[2];
 	
-	if (ARG_COUNT(ht) != 2 || getParametersEx(2, &haystack, &needle) ==
+	if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &haystack, &needle) ==
 		FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
@@ -658,12 +658,12 @@ PHP_FUNCTION(strpos)
 	
 	switch(ARG_COUNT(ht)) {
 	case 2:
-		if (getParametersEx(2, &haystack, &needle) == FAILURE) {
+		if (zend_get_parameters_ex(2, &haystack, &needle) == FAILURE) {
 			WRONG_PARAM_COUNT;
 		}
 		break;
 	case 3:
-		if (getParametersEx(3, &haystack, &needle, &OFFSET) == FAILURE) {
+		if (zend_get_parameters_ex(3, &haystack, &needle, &OFFSET) == FAILURE) {
 			WRONG_PARAM_COUNT;
 		}
 		convert_to_long_ex(OFFSET);
@@ -720,7 +720,7 @@ PHP_FUNCTION(strrpos)
 	pval **haystack, **needle;
 	char *found = NULL;
 	
-	if (ARG_COUNT(ht) != 2 || getParametersEx(2, &haystack, &needle) == FAILURE) {
+	if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &haystack, &needle) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_string_ex(haystack);
@@ -747,7 +747,7 @@ PHP_FUNCTION(strrchr)
 	pval **haystack, **needle;
 	char *found = NULL;
 	
-	if (ARG_COUNT(ht) != 2 || getParametersEx(2, &haystack, &needle) ==
+	if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &haystack, &needle) ==
 		FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
@@ -821,7 +821,7 @@ PHP_FUNCTION(chunk_split)
 	argc = ARG_COUNT(ht);
 
 	if (argc < 1 || argc > 3 ||
-		getParametersEx(argc, &p_str, &p_chunklen, &p_ending) == FAILURE) {
+		zend_get_parameters_ex(argc, &p_str, &p_chunklen, &p_ending) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
@@ -863,8 +863,8 @@ PHP_FUNCTION(substr)
 	
 	argc = ARG_COUNT(ht);
 
-	if ((argc == 2 && getParametersEx(2, &string, &from) == FAILURE) ||
-		(argc == 3 && getParametersEx(3, &string, &from, &len) == FAILURE) ||
+	if ((argc == 2 && zend_get_parameters_ex(2, &string, &from) == FAILURE) ||
+		(argc == 3 && zend_get_parameters_ex(3, &string, &from, &len) == FAILURE) ||
 		argc < 2 || argc > 3) {
 		WRONG_PARAM_COUNT;
 	}
@@ -928,8 +928,8 @@ PHP_FUNCTION(substr_replace)
 	
 	argc = ARG_COUNT(ht);
 
-	if ((argc == 3 && getParametersEx(3, &string, &repl, &from) == FAILURE) ||
-		(argc == 4 && getParametersEx(4, &string, &repl, &from, &len) == FAILURE) ||
+	if ((argc == 3 && zend_get_parameters_ex(3, &string, &repl, &from) == FAILURE) ||
+		(argc == 4 && zend_get_parameters_ex(4, &string, &repl, &from, &len) == FAILURE) ||
 		argc < 3 || argc > 4) {
 		WRONG_PARAM_COUNT;
 	}
@@ -996,7 +996,7 @@ PHP_FUNCTION(quotemeta)
 	char *p, *q;
 	char c;
 	
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_string_ex(arg);
@@ -1039,7 +1039,7 @@ PHP_FUNCTION(ord)
 {
 	pval **str;
 	
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &str) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &str) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_string_ex(str);
@@ -1054,7 +1054,7 @@ PHP_FUNCTION(chr)
 	pval **num;
 	char temp[2];
 	
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &num) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &num) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_long_ex(num);
@@ -1070,7 +1070,7 @@ PHP_FUNCTION(ucfirst)
 {
 	pval **arg;
 	
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_string_ex(arg);
@@ -1093,7 +1093,7 @@ PHP_FUNCTION(ucwords)
 	char *r;
 	char *r_end;
 	
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &str) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &str) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_string_ex(str);
@@ -1248,7 +1248,7 @@ PHP_FUNCTION(strtr)
 	pval **str, **from, **to;
 	int ac = ARG_COUNT(ht);
 
-	if (ac < 2 || ac > 3 || getParametersEx(ac, &str, &from, &to) == FAILURE) {
+	if (ac < 2 || ac > 3 || zend_get_parameters_ex(ac, &str, &from, &to) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	
@@ -1286,7 +1286,7 @@ PHP_FUNCTION(strrev)
 	int i,len;
 	char c;
 	
-	if (ARG_COUNT(ht)!=1 || getParametersEx(1, &str)==FAILURE) {
+	if (ARG_COUNT(ht)!=1 || zend_get_parameters_ex(1, &str)==FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	
@@ -1353,7 +1353,7 @@ PHP_FUNCTION(similar_text)
 	int sim;
 	
 	if (ac < 2 || ac > 3 ||
-		getParametersEx(ac, &t1, &t2, &percent) == FAILURE) {
+		zend_get_parameters_ex(ac, &t1, &t2, &percent) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	
@@ -1439,7 +1439,7 @@ PHP_FUNCTION(addcslashes)
 {
 	pval **str, **what;
 
-	if (ARG_COUNT(ht) != 2 || getParametersEx(2, &str, &what) == FAILURE) {
+	if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &str, &what) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_string_ex(str);
@@ -1455,7 +1455,7 @@ PHP_FUNCTION(addslashes)
 {
 	pval **str;
 
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &str) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &str) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_string_ex(str);
@@ -1470,7 +1470,7 @@ PHP_FUNCTION(stripcslashes)
 {
 	pval **str;
 	
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &str) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &str) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_string_ex(str);
@@ -1487,7 +1487,7 @@ PHP_FUNCTION(stripslashes)
 {
 	pval **str;
 	
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &str) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &str) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_string_ex(str);
@@ -1790,7 +1790,7 @@ PHP_FUNCTION(str_replace)
 	int len = 0;
 
 	if(ARG_COUNT(ht) != 3 ||
-			getParametersEx(3, &needle, &str, &haystack) == FAILURE) {
+			zend_get_parameters_ex(3, &needle, &str, &haystack) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
@@ -1839,12 +1839,12 @@ static void php_hebrev(INTERNAL_FUNCTION_PARAMETERS,int convert_newlines)
 	
 	switch(ARG_COUNT(ht)) {
 		case 1:
-			if (getParametersEx(1, &str)==FAILURE) {
+			if (zend_get_parameters_ex(1, &str)==FAILURE) {
 				RETURN_FALSE;
 			}
 			break;
 		case 2:
-			if (getParametersEx(2, &str, &max_chars_per_line)==FAILURE) {
+			if (zend_get_parameters_ex(2, &str, &max_chars_per_line)==FAILURE) {
 				RETURN_FALSE;
 			}
 			convert_to_long_ex(max_chars_per_line);
@@ -2013,7 +2013,7 @@ PHP_FUNCTION(nl2br)
 {
 	pval **str;
 	
-	if (ARG_COUNT(ht)!=1 || getParametersEx(1, &str)==FAILURE) {
+	if (ARG_COUNT(ht)!=1 || zend_get_parameters_ex(1, &str)==FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	
@@ -2032,12 +2032,12 @@ PHP_FUNCTION(strip_tags)
 
 	switch(ARG_COUNT(ht)) {
 		case 1:
-			if(getParametersEx(1, &str)==FAILURE) {
+			if(zend_get_parameters_ex(1, &str)==FAILURE) {
 				RETURN_FALSE;
 			}
 			break;
 		case 2:
-			if(getParametersEx(2, &str, &allow)==FAILURE) {
+			if(zend_get_parameters_ex(2, &str, &allow)==FAILURE) {
 				RETURN_FALSE;
 			}
 			convert_to_string_ex(allow);
@@ -2063,7 +2063,7 @@ PHP_FUNCTION(setlocale)
 	char *loc, *retval;
 	BLS_FETCH();
 
-	if (ARG_COUNT(ht)!=2 || getParametersEx(2, &pcategory, &plocale)==FAILURE)
+	if (ARG_COUNT(ht)!=2 || zend_get_parameters_ex(2, &pcategory, &plocale)==FAILURE)
 		WRONG_PARAM_COUNT;
 #ifdef HAVE_SETLOCALE
 	convert_to_string_ex(pcategory);
@@ -2116,7 +2116,7 @@ PHP_FUNCTION(parse_str)
 	PLS_FETCH();
 	SLS_FETCH();
 
-	if (getParametersEx(1, &arg) == FAILURE) {
+	if (zend_get_parameters_ex(1, &arg) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_string_ex(arg);
@@ -2318,7 +2318,7 @@ PHP_FUNCTION(str_repeat)
 	int			  result_len;		/* Length of the resulting string */
 	int			  i;
 	
-	if (ARG_COUNT(ht) != 2 || getParametersEx(2, &input_str, &mult) == FAILURE) {
+	if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &input_str, &mult) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	
@@ -2365,7 +2365,7 @@ PHP_FUNCTION(count_chars)
 	char retstr[256];
 	int retlen=0;
 
-	if (ac < 1 || ac > 2 || getParametersEx(ac, &input, &mode) == FAILURE) {
+	if (ac < 1 || ac > 2 || zend_get_parameters_ex(ac, &input, &mode) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	
diff --git a/ext/standard/syslog.c b/ext/standard/syslog.c
index aaec497fd9..5777bfe93f 100644
--- a/ext/standard/syslog.c
+++ b/ext/standard/syslog.c
@@ -205,7 +205,7 @@ PHP_FUNCTION(define_syslog_variables)
 PHP_FUNCTION(openlog)
 {
 	pval **ident, **option, **facility;
-	if (ARG_COUNT(ht) != 3 || getParametersEx(3, &ident, &option, &facility) == FAILURE) {
+	if (ARG_COUNT(ht) != 3 || zend_get_parameters_ex(3, &ident, &option, &facility) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_string_ex(ident);
@@ -239,7 +239,7 @@ PHP_FUNCTION(syslog)
 {
 	pval **priority, **message;
 
-	if (ARG_COUNT(ht) != 2 || getParametersEx(2, &priority, &message) == FAILURE) {
+	if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &priority, &message) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_long_ex(priority);
diff --git a/ext/standard/uniqid.c b/ext/standard/uniqid.c
index ced8f5c2a1..59d351f9ac 100644
--- a/ext/standard/uniqid.c
+++ b/ext/standard/uniqid.c
@@ -51,7 +51,7 @@ PHP_FUNCTION(uniqid)
 	struct timeval tv;
 
 	argc = ARG_COUNT(ht);
-	if (argc < 1 || argc > 2 || getParametersEx(argc, &prefix, &flags)) {
+	if (argc < 1 || argc > 2 || zend_get_parameters_ex(argc, &prefix, &flags)) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_string_ex(prefix);
diff --git a/ext/standard/url.c b/ext/standard/url.c
index 15258bd03a..f24ec61d14 100644
--- a/ext/standard/url.c
+++ b/ext/standard/url.c
@@ -158,7 +158,7 @@ PHP_FUNCTION(parse_url)
 	pval **string;
 	url *resource;
 
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &string) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &string) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_string_ex(string);
@@ -266,7 +266,7 @@ PHP_FUNCTION(urlencode)
 	pval **arg;
 	char *str;
 
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_string_ex(arg);
@@ -288,7 +288,7 @@ PHP_FUNCTION(urldecode)
 	pval **arg;
 	int len;
 
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_string_ex(arg);
@@ -366,7 +366,7 @@ PHP_FUNCTION(rawurlencode)
 	pval **arg;
 	char *str;
 
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_string_ex(arg);
@@ -387,7 +387,7 @@ PHP_FUNCTION(rawurldecode)
 	pval **arg;
 	int len;
 
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_string_ex(arg);
diff --git a/ext/standard/var.c b/ext/standard/var.c
index cf2f241b65..0b160c700e 100644
--- a/ext/standard/var.c
+++ b/ext/standard/var.c
@@ -151,7 +151,7 @@ PHP_FUNCTION(var_dump)
 	argc = ARG_COUNT(ht);
 	
 	args = (zval ***)emalloc(argc * sizeof(zval **));
-	if (ARG_COUNT(ht) == 0 || getParametersArrayEx(argc, args) == FAILURE) {
+	if (ARG_COUNT(ht) == 0 || zend_get_parameters_array_ex(argc, args) == FAILURE) {
 		efree(args);
 		WRONG_PARAM_COUNT;
 	}
@@ -472,7 +472,7 @@ PHP_FUNCTION(serialize)
 {
 	pval **struc;
 
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &struc) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &struc) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	return_value->type = IS_STRING;
@@ -490,7 +490,7 @@ PHP_FUNCTION(unserialize)
 {
 	pval **buf;
 	
-	if (ARG_COUNT(ht) != 1 || getParametersEx(1, &buf) == FAILURE) {
+	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &buf) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}