4 files changed, 50 insertions, 60 deletions

diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 3ccc557056..68921a6313 100644
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -590,7 +590,7 @@ ZEND_API inline int _array_init(zval *arg ZEND_FILE_LINE_DC)
 }
 
 
-ZEND_API inline int _object_init_ex(zval *arg, zend_class_entry *class_type ZEND_FILE_LINE_DC)
+ZEND_API int _object_init_ex(zval *arg, zend_class_entry *class_type ZEND_FILE_LINE_DC)
 {
 	zval *tmp;
 
@@ -608,20 +608,20 @@ ZEND_API inline int _object_init_ex(zval *arg, zend_class_entry *class_type ZEND
 }
 
 
-ZEND_API inline int _object_init(zval *arg ZEND_FILE_LINE_DC)
+ZEND_API int _object_init(zval *arg ZEND_FILE_LINE_DC)
 {
 	return _object_init_ex(arg, &zend_standard_class_def ZEND_FILE_LINE_CC);
 }
 
 
-ZEND_API inline int add_assoc_function(zval *arg, char *key,void (*function_ptr)(INTERNAL_FUNCTION_PARAMETERS))
+ZEND_API int add_assoc_function(zval *arg, char *key,void (*function_ptr)(INTERNAL_FUNCTION_PARAMETERS))
 {
 	zend_error(E_WARNING, "add_assoc_function() is no longer supported");
 	return FAILURE;
 }
 
 
-ZEND_API inline int add_assoc_long_ex(zval *arg, char *key, uint key_len, long n)
+ZEND_API int add_assoc_long_ex(zval *arg, char *key, uint key_len, long n)
 {
 	zval *tmp;
 
@@ -631,7 +631,7 @@ ZEND_API inline int add_assoc_long_ex(zval *arg, char *key, uint key_len, long n
 	return zend_hash_update(Z_ARRVAL_P(arg), key, key_len, (void *) &tmp, sizeof(zval *), NULL);
 }
 
-ZEND_API inline int add_assoc_null_ex(zval *arg, char *key, uint key_len)
+ZEND_API int add_assoc_null_ex(zval *arg, char *key, uint key_len)
 {
 	zval *tmp;
 	
@@ -641,7 +641,7 @@ ZEND_API inline int add_assoc_null_ex(zval *arg, char *key, uint key_len)
 	return zend_hash_update(Z_ARRVAL_P(arg), key, key_len, (void *) &tmp, sizeof(zval *), NULL);
 }
 
-ZEND_API inline int add_assoc_bool_ex(zval *arg, char *key, uint key_len, int b)
+ZEND_API int add_assoc_bool_ex(zval *arg, char *key, uint key_len, int b)
 {
 	zval *tmp;
 	
@@ -651,7 +651,7 @@ ZEND_API inline int add_assoc_bool_ex(zval *arg, char *key, uint key_len, int b)
 	return zend_hash_update(Z_ARRVAL_P(arg), key, key_len, (void *) &tmp, sizeof(zval *), NULL);
 }
 
-ZEND_API inline int add_assoc_resource_ex(zval *arg, char *key, uint key_len, int r)
+ZEND_API int add_assoc_resource_ex(zval *arg, char *key, uint key_len, int r)
 {
 	zval *tmp;
 	
@@ -662,7 +662,7 @@ ZEND_API inline int add_assoc_resource_ex(zval *arg, char *key, uint key_len, in
 }
 
 
-ZEND_API inline int add_assoc_double_ex(zval *arg, char *key, uint key_len, double d)
+ZEND_API int add_assoc_double_ex(zval *arg, char *key, uint key_len, double d)
 {
 	zval *tmp;
 	
@@ -673,7 +673,7 @@ ZEND_API inline int add_assoc_double_ex(zval *arg, char *key, uint key_len, doub
 }
 
 
-ZEND_API inline int add_assoc_string_ex(zval *arg, char *key, uint key_len, char *str, int duplicate)
+ZEND_API int add_assoc_string_ex(zval *arg, char *key, uint key_len, char *str, int duplicate)
 {
 	zval *tmp;
 	
@@ -684,7 +684,7 @@ ZEND_API inline int add_assoc_string_ex(zval *arg, char *key, uint key_len, char
 }
 
 
-ZEND_API inline int add_assoc_stringl_ex(zval *arg, char *key, uint key_len, char *str, uint length, int duplicate)
+ZEND_API int add_assoc_stringl_ex(zval *arg, char *key, uint key_len, char *str, uint length, int duplicate)
 {
 	zval *tmp;
 	
@@ -694,13 +694,13 @@ ZEND_API inline int add_assoc_stringl_ex(zval *arg, char *key, uint key_len, cha
 	return zend_hash_update(Z_ARRVAL_P(arg), key, key_len, (void *) &tmp, sizeof(zval *), NULL);
 }
 
-ZEND_API inline int add_assoc_zval_ex(zval *arg, char *key, uint key_len, zval *value)
+ZEND_API int add_assoc_zval_ex(zval *arg, char *key, uint key_len, zval *value)
 {
 	return zend_hash_update(Z_ARRVAL_P(arg), key, key_len, (void *) &value, sizeof(zval *), NULL);
 }
 
 
-ZEND_API inline int add_index_long(zval *arg, uint index, long n)
+ZEND_API int add_index_long(zval *arg, uint index, long n)
 {
 	zval *tmp;
 
@@ -711,7 +711,7 @@ ZEND_API inline int add_index_long(zval *arg, uint index, long n)
 }
 
 
-ZEND_API inline int add_index_null(zval *arg, uint index)
+ZEND_API int add_index_null(zval *arg, uint index)
 {
 	zval *tmp;
 
@@ -721,7 +721,7 @@ ZEND_API inline int add_index_null(zval *arg, uint index)
 	return zend_hash_index_update(Z_ARRVAL_P(arg), index, (void *) &tmp, sizeof(zval *), NULL);
 }
 
-ZEND_API inline int add_index_bool(zval *arg, uint index, int b)
+ZEND_API int add_index_bool(zval *arg, uint index, int b)
 {
 	zval *tmp;
 	
@@ -732,7 +732,7 @@ ZEND_API inline int add_index_bool(zval *arg, uint index, int b)
 }
 
 
-ZEND_API inline int add_index_resource(zval *arg, uint index, int r)
+ZEND_API int add_index_resource(zval *arg, uint index, int r)
 {
 	zval *tmp;
 	
@@ -743,7 +743,7 @@ ZEND_API inline int add_index_resource(zval *arg, uint index, int r)
 }
 
 
-ZEND_API inline int add_index_double(zval *arg, uint index, double d)
+ZEND_API int add_index_double(zval *arg, uint index, double d)
 {
 	zval *tmp;
 	
@@ -754,7 +754,7 @@ ZEND_API inline int add_index_double(zval *arg, uint index, double d)
 }
 
 
-ZEND_API inline int add_index_string(zval *arg, uint index, char *str, int duplicate)
+ZEND_API int add_index_string(zval *arg, uint index, char *str, int duplicate)
 {
 	zval *tmp;
 	
@@ -765,7 +765,7 @@ ZEND_API inline int add_index_string(zval *arg, uint index, char *str, int dupli
 }
 
 
-ZEND_API inline int add_index_stringl(zval *arg, uint index, char *str, uint length, int duplicate)
+ZEND_API int add_index_stringl(zval *arg, uint index, char *str, uint length, int duplicate)
 {
 	zval *tmp;
 	
@@ -776,13 +776,13 @@ ZEND_API inline int add_index_stringl(zval *arg, uint index, char *str, uint len
 }
 
 
-ZEND_API inline int add_index_zval(zval *arg, uint index, zval *value)
+ZEND_API int add_index_zval(zval *arg, uint index, zval *value)
 {
 	return zend_hash_index_update(Z_ARRVAL_P(arg), index, (void *) &value, sizeof(zval *), NULL);
 }
 
 
-ZEND_API inline int add_next_index_long(zval *arg, long n)
+ZEND_API int add_next_index_long(zval *arg, long n)
 {
 	zval *tmp;
 	
@@ -793,7 +793,7 @@ ZEND_API inline int add_next_index_long(zval *arg, long n)
 }
 
 
-ZEND_API inline int add_next_index_null(zval *arg)
+ZEND_API int add_next_index_null(zval *arg)
 {
 	zval *tmp;
 	
@@ -804,7 +804,7 @@ ZEND_API inline int add_next_index_null(zval *arg)
 }
 
 
-ZEND_API inline int add_next_index_bool(zval *arg, int b)
+ZEND_API int add_next_index_bool(zval *arg, int b)
 {
 	zval *tmp;
 	
@@ -815,7 +815,7 @@ ZEND_API inline int add_next_index_bool(zval *arg, int b)
 }
 
 
-ZEND_API inline int add_next_index_resource(zval *arg, int r)
+ZEND_API int add_next_index_resource(zval *arg, int r)
 {
 	zval *tmp;
 	
@@ -826,7 +826,7 @@ ZEND_API inline int add_next_index_resource(zval *arg, int r)
 }
 
 
-ZEND_API inline int add_next_index_double(zval *arg, double d)
+ZEND_API int add_next_index_double(zval *arg, double d)
 {
 	zval *tmp;
 	
@@ -837,7 +837,7 @@ ZEND_API inline int add_next_index_double(zval *arg, double d)
 }
 
 
-ZEND_API inline int add_next_index_string(zval *arg, char *str, int duplicate)
+ZEND_API int add_next_index_string(zval *arg, char *str, int duplicate)
 {
 	zval *tmp;
 
@@ -848,7 +848,7 @@ ZEND_API inline int add_next_index_string(zval *arg, char *str, int duplicate)
 }
 
 
-ZEND_API inline int add_next_index_stringl(zval *arg, char *str, uint length, int duplicate)
+ZEND_API int add_next_index_stringl(zval *arg, char *str, uint length, int duplicate)
 {
 	zval *tmp;
 
@@ -859,13 +859,13 @@ ZEND_API inline int add_next_index_stringl(zval *arg, char *str, uint length, in
 }
 
 
-ZEND_API inline int add_next_index_zval(zval *arg, zval *value)
+ZEND_API int add_next_index_zval(zval *arg, zval *value)
 {
 	return zend_hash_next_index_insert(Z_ARRVAL_P(arg), &value, sizeof(zval *), NULL);
 }
 
 
-ZEND_API inline int add_get_assoc_string_ex(zval *arg, char *key, uint key_len, char *str, void **dest, int duplicate)
+ZEND_API int add_get_assoc_string_ex(zval *arg, char *key, uint key_len, char *str, void **dest, int duplicate)
 {
 	zval *tmp;
 	
@@ -876,7 +876,7 @@ ZEND_API inline int add_get_assoc_string_ex(zval *arg, char *key, uint key_len,
 }
 
 
-ZEND_API inline int add_get_assoc_stringl_ex(zval *arg, char *key, uint key_len, char *str, uint length, void **dest, int duplicate)
+ZEND_API int add_get_assoc_stringl_ex(zval *arg, char *key, uint key_len, char *str, uint length, void **dest, int duplicate)
 {
 	zval *tmp;
 	
@@ -887,7 +887,7 @@ ZEND_API inline int add_get_assoc_stringl_ex(zval *arg, char *key, uint key_len,
 }
 
 
-ZEND_API inline int add_get_index_long(zval *arg, uint index, long l, void **dest)
+ZEND_API int add_get_index_long(zval *arg, uint index, long l, void **dest)
 {
 	zval *tmp;
 	
@@ -898,7 +898,7 @@ ZEND_API inline int add_get_index_long(zval *arg, uint index, long l, void **des
 }
 
 
-ZEND_API inline int add_get_index_double(zval *arg, uint index, double d, void **dest)
+ZEND_API int add_get_index_double(zval *arg, uint index, double d, void **dest)
 {
 	zval *tmp;
 	
@@ -909,7 +909,7 @@ ZEND_API inline int add_get_index_double(zval *arg, uint index, double d, void *
 }
 
 
-ZEND_API inline int add_get_index_string(zval *arg, uint index, char *str, void **dest, int duplicate)
+ZEND_API int add_get_index_string(zval *arg, uint index, char *str, void **dest, int duplicate)
 {
 	zval *tmp;
 	
@@ -920,7 +920,7 @@ ZEND_API inline int add_get_index_string(zval *arg, uint index, char *str, void
 }
 
 
-ZEND_API inline int add_get_index_stringl(zval *arg, uint index, char *str, uint length, void **dest, int duplicate)
+ZEND_API int add_get_index_stringl(zval *arg, uint index, char *str, uint length, void **dest, int duplicate)
 {
 	zval *tmp;
 	
@@ -931,7 +931,7 @@ ZEND_API inline int add_get_index_stringl(zval *arg, uint index, char *str, uint
 }
 
 
-ZEND_API inline int add_property_long_ex(zval *arg, char *key, uint key_len, long n)
+ZEND_API int add_property_long_ex(zval *arg, char *key, uint key_len, long n)
 {
 	zval *tmp;
 
@@ -941,7 +941,7 @@ ZEND_API inline int add_property_long_ex(zval *arg, char *key, uint key_len, lon
 	return zend_hash_update(Z_OBJPROP_P(arg), key, key_len, (void *) &tmp, sizeof(zval *), NULL);
 }
 
-ZEND_API inline int add_property_bool_ex(zval *arg, char *key, uint key_len, int b)
+ZEND_API int add_property_bool_ex(zval *arg, char *key, uint key_len, int b)
 {
 	zval *tmp;
 
@@ -951,7 +951,7 @@ ZEND_API inline int add_property_bool_ex(zval *arg, char *key, uint key_len, int
 	return zend_hash_update(Z_OBJPROP_P(arg), key, key_len, (void *) &tmp, sizeof(zval *), NULL);
 }
 
-ZEND_API inline int add_property_null_ex(zval *arg, char *key, uint key_len)
+ZEND_API int add_property_null_ex(zval *arg, char *key, uint key_len)
 {
 	zval *tmp;
 	
@@ -961,7 +961,7 @@ ZEND_API inline int add_property_null_ex(zval *arg, char *key, uint key_len)
 	return zend_hash_update(Z_OBJPROP_P(arg), key, key_len, (void *) &tmp, sizeof(zval *), NULL);
 }
 
-ZEND_API inline int add_property_resource_ex(zval *arg, char *key, uint key_len, long n)
+ZEND_API int add_property_resource_ex(zval *arg, char *key, uint key_len, long n)
 {
 	zval *tmp;
 	
@@ -972,7 +972,7 @@ ZEND_API inline int add_property_resource_ex(zval *arg, char *key, uint key_len,
 }
 
 
-ZEND_API inline int add_property_double_ex(zval *arg, char *key, uint key_len, double d)
+ZEND_API int add_property_double_ex(zval *arg, char *key, uint key_len, double d)
 {
 	zval *tmp;
 	
@@ -983,7 +983,7 @@ ZEND_API inline int add_property_double_ex(zval *arg, char *key, uint key_len, d
 }
 
 
-ZEND_API inline int add_property_string_ex(zval *arg, char *key, uint key_len, char *str, int duplicate)
+ZEND_API int add_property_string_ex(zval *arg, char *key, uint key_len, char *str, int duplicate)
 {
 	zval *tmp;
 
@@ -993,7 +993,7 @@ ZEND_API inline int add_property_string_ex(zval *arg, char *key, uint key_len, c
 	return zend_hash_update(Z_OBJPROP_P(arg), key, key_len, (void *) &tmp, sizeof(zval *), NULL);
 }
 
-ZEND_API inline int add_property_stringl_ex(zval *arg, char *key, uint key_len, char *str, uint length, int duplicate)
+ZEND_API int add_property_stringl_ex(zval *arg, char *key, uint key_len, char *str, uint length, int duplicate)
 {
 	zval *tmp;
 
@@ -1003,7 +1003,7 @@ ZEND_API inline int add_property_stringl_ex(zval *arg, char *key, uint key_len,
 	return zend_hash_update(Z_OBJPROP_P(arg), key, key_len, (void *) &tmp, sizeof(zval *), NULL);
 }
 
-ZEND_API inline int add_property_zval_ex(zval *arg, char *key, uint key_len, zval *value)
+ZEND_API int add_property_zval_ex(zval *arg, char *key, uint key_len, zval *value)
 {
 	return zend_hash_update(Z_OBJPROP_P(arg), key, key_len, (void *) &value, sizeof(zval *), NULL);
 }
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c
index de0ca96368..44f98938e1 100644
--- a/Zend/zend_operators.c
+++ b/Zend/zend_operators.c
@@ -462,7 +462,7 @@ ZEND_API void _convert_to_string(zval *op ZEND_FILE_LINE_DC)
 			break;
 		default:
 			zval_dtor(op);
-			var_reset(op);
+			ZVAL_RESET(op);
 			break;
 	}
 	op->type = IS_STRING;
@@ -719,7 +719,7 @@ ZEND_API int div_function(zval *result, zval *op1, zval *op2)
 
 	if ((op2->type == IS_LONG && op2->value.lval == 0) || (op2->type == IS_DOUBLE && op2->value.dval == 0.0)) {
 		zend_error(E_WARNING, "Division by zero");
-		var_reset(result);
+		ZVAL_RESET(result);
 		return FAILURE;			/* division by zero */
 	}
 	if (op1->type == IS_LONG && op2->type == IS_LONG) {
@@ -758,7 +758,7 @@ ZEND_API int mod_function(zval *result, zval *op1, zval *op2)
 	zendi_convert_to_long(op2, op2_copy, result);
 
 	if (op2->value.lval == 0) {
-		var_reset(result);
+		ZVAL_RESET(result);
 		return FAILURE;			/* modulus by zero */
 	}
 
@@ -1164,7 +1164,7 @@ ZEND_API int compare_function(zval *result, zval *op1, zval *op2)
 		return SUCCESS;
 	}
 
-	var_reset(result);
+	ZVAL_RESET(result);
 	return FAILURE;
 }
 
@@ -1231,7 +1231,7 @@ ZEND_API int is_identical_function(zval *result, zval *op1, zval *op2)
 			}
 			break;
 		default:
-			var_reset(result);
+			ZVAL_RESET(result);
 			return FAILURE;
 	}
 	return SUCCESS;
diff --git a/Zend/zend_variables.c b/Zend/zend_variables.c
index af1be82ed9..441a5d29b0 100644
--- a/Zend/zend_variables.c
+++ b/Zend/zend_variables.c
@@ -31,19 +31,6 @@ ZEND_API char *empty_string = "";	/* in order to save emalloc() and efree() time
 									 * The macro STR_FREE() will not efree() it.
 									 */
 
-/* this function MUST set the value for the variable to an empty string */
-/* and empty strings must be evaluated as FALSE */
-ZEND_API inline void var_reset(zval *var)
-{
-#if 0
-	var->type = IS_STRING;
-	var->value.str.val = empty_string;
-	var->value.str.len = 0;
-#else
-	var->type = IS_BOOL;
-	var->value.lval = 0;
-#endif
-}
 
 ZEND_API inline void var_uninit(zval *var)
 {
diff --git a/Zend/zend_variables.h b/Zend/zend_variables.h
index 7dd6f8acd3..a0cd7fc357 100644
--- a/Zend/zend_variables.h
+++ b/Zend/zend_variables.h
@@ -54,7 +54,10 @@ ZEND_API void zval_add_ref(zval **p);
 #define ZVAL_PTR_DTOR (void (*)(void *)) zval_ptr_dtor_wrapper
 #define ZVAL_COPY_CTOR (void (*)(void *)) zval_copy_ctor_wrapper
 
-ZEND_API void var_reset(zval *var);
+#define ZVAL_RESET(var)		\
+	(var)->type = IS_BOOL;	\
+	(var)->value.lval = 0;
+
 ZEND_API void var_uninit(zval *var);
 
 #endif