From 17efa1aea69564503d381587877c3bc6264df71f Mon Sep 17 00:00:00 2001
From: Antony Dovgal <tony2001@php.net>
Date: Wed, 10 Jan 2007 14:10:28 +0000
Subject: [PATCH] fix #40083

---
 sapi/milter/php_milter.c | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/sapi/milter/php_milter.c b/sapi/milter/php_milter.c
index 637704290c..d038e24be3 100644
--- a/sapi/milter/php_milter.c
+++ b/sapi/milter/php_milter.c
@@ -581,11 +581,11 @@ PHP_FUNCTION(smfi_getsymval)
 		php_error(E_WARNING, IS_NONE, get_active_function_name(TSRMLS_C));
 	} else if (zend_parse_parameters(1 TSRMLS_CC, "s", &symname, &len) == SUCCESS) {
 		if ((ret = smfi_getsymval(MG(ctx), symname)) != NULL) {
-			RETVAL_STRING(ret, 1);
+			RETURN_STRING(ret, 1);
 		}
 	}
 
-	RETVAL_NULL();
+	RETURN_NULL();
 }
 /* }}} */
 
@@ -602,11 +602,11 @@ PHP_FUNCTION(smfi_setreply)
 		php_error(E_WARNING, IS_NONE, get_active_function_name(TSRMLS_C));
 	} else if (zend_parse_parameters(3 TSRMLS_CC, "sss", &rcode, &len, &xcode, &len, &message, &len) == SUCCESS) {
 		if (smfi_setreply(MG(ctx), rcode, xcode, message) == MI_SUCCESS) {
-			RETVAL_TRUE;
+			RETURN_TRUE;
 		}
 	}
 	
-	RETVAL_FALSE;
+	RETURN_FALSE;
 }
 /* }}} */
 
@@ -622,11 +622,11 @@ PHP_FUNCTION(smfi_addheader)
 		php_error(E_WARNING, NOT_EOM, get_active_function_name(TSRMLS_C));
 	} else if (zend_parse_parameters(2 TSRMLS_CC, "ss", &f, &len, &v, &len) == SUCCESS) {
 		if (smfi_addheader(MG(ctx), f, v) == MI_SUCCESS) {
-			RETVAL_TRUE;
+			RETURN_TRUE;
 		}
 	}
 	
-	RETVAL_FALSE;
+	RETURN_FALSE;
 }
 /* }}} */
 
@@ -643,11 +643,11 @@ PHP_FUNCTION(smfi_chgheader)
 		php_error(E_WARNING, NOT_EOM, get_active_function_name(TSRMLS_C));
 	} else if (zend_parse_parameters(3 TSRMLS_CC, "sls", &f, &len, &idx, &v, &len) == SUCCESS) {
 		if (smfi_chgheader(MG(ctx), f, idx, v) == MI_SUCCESS) {
-			RETVAL_TRUE;
+			RETURN_TRUE;
 		}
 	}
 	
-	RETVAL_FALSE;
+	RETURN_FALSE;
 }
 /* }}} */
 
@@ -663,11 +663,11 @@ PHP_FUNCTION(smfi_addrcpt)
 		php_error(E_WARNING, NOT_EOM, get_active_function_name(TSRMLS_C));
 	} else if (zend_parse_parameters(1 TSRMLS_CC, "s", &rcpt, &len) == SUCCESS) {
 		if (smfi_addrcpt(MG(ctx), rcpt) == MI_SUCCESS) {
-			RETVAL_TRUE;
+			RETURN_TRUE;
 		}
 	}
 	
-	RETVAL_FALSE;
+	RETURN_FALSE;
 }
 /* }}} */
 
@@ -683,11 +683,11 @@ PHP_FUNCTION(smfi_delrcpt)
 		php_error(E_WARNING, NOT_EOM, get_active_function_name(TSRMLS_C));
 	} else if (zend_parse_parameters(1 TSRMLS_CC, "s", &rcpt, &len) == SUCCESS) {
 		if (smfi_delrcpt(MG(ctx), rcpt) == MI_SUCCESS) {
-			RETVAL_TRUE;
+			RETURN_TRUE;
 		}
 	}
 	
-	RETVAL_FALSE;
+	RETURN_FALSE;
 }
 /* }}} */
 
@@ -704,11 +704,11 @@ PHP_FUNCTION(smfi_replacebody)
 		php_error(E_WARNING, NOT_EOM, get_active_function_name(TSRMLS_C));
 	} else if (zend_parse_parameters(1 TSRMLS_CC, "s", &body, &len) == SUCCESS) {
 		if (smfi_replacebody(MG(ctx), body, len) == MI_SUCCESS) {
-			RETVAL_TRUE;
+			RETURN_TRUE;
 		}
 	}
 	
-	RETVAL_FALSE;
+	RETURN_FALSE;
 }
 /* }}} */
 
-- 
2.40.0