- Remove two unused functions

diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c
index df394a7df483ced3923d9038a60899a9fd7a1a34..78b39f451519ab357b75542eab3f59a1282fc531 100644 (file)
--- a/Zend/zend_operators.c
+++ b/Zend/zend_operators.c
@@ -743,47 +743,6 @@ ZEND_API int mod_function(zval *result, zval *op1, zval *op2)
 }
 
 
-ZEND_API int boolean_or_function(zval *result, zval *op1, zval *op2)
-{
-       zval op1_copy, op2_copy;
-       
-       result->type = IS_BOOL;
-
-       zendi_convert_to_boolean(op1, op1_copy, result);
-       if (op1->value.lval) {
-               result->value.lval = 1;
-               return SUCCESS;
-       }
-       zendi_convert_to_boolean(op2, op2_copy, result);
-       if (op2->value.lval) {
-               result->value.lval = 1;
-               return SUCCESS;
-       }
-       result->value.lval = 0;
-       return SUCCESS;
-}
-
-
-ZEND_API int boolean_and_function(zval *result, zval *op1, zval *op2)
-{
-       zval op1_copy, op2_copy;
-       
-       result->type = IS_BOOL;
-
-       zendi_convert_to_boolean(op1, op1_copy, result);
-       if (!op1->value.lval) {
-               result->value.lval = 0;
-               return SUCCESS;
-       }
-       zendi_convert_to_boolean(op2, op2_copy, result);
-       if (!op2->value.lval) {
-               result->value.lval = 0;
-               return SUCCESS;
-       }
-       result->value.lval = 1;
-       return SUCCESS;
-}
-
 
 ZEND_API int boolean_xor_function(zval *result, zval *op1, zval *op2)
 {

diff --git a/Zend/zend_operators.h b/Zend/zend_operators.h
index 75b1dd7fb3b6f2f6f5bac6f3b4fc975a8a89ab5e..de3e8e6011a8347aa3fbf04a1e08621664d9d7af 100644 (file)
--- a/Zend/zend_operators.h
+++ b/Zend/zend_operators.h
@@ -41,9 +41,7 @@ ZEND_API int sub_function(zval *result, zval *op1, zval *op2);
 ZEND_API int mul_function(zval *result, zval *op1, zval *op2);
 ZEND_API int div_function(zval *result, zval *op1, zval *op2);
 ZEND_API int mod_function(zval *result, zval *op1, zval *op2);
-ZEND_API int boolean_or_function(zval *result, zval *op1, zval *op2);
 ZEND_API int boolean_xor_function(zval *result, zval *op1, zval *op2);
-ZEND_API int boolean_and_function(zval *result, zval *op1, zval *op2);
 ZEND_API int boolean_not_function(zval *result, zval *op1);
 ZEND_API int bitwise_not_function(zval *result, zval *op1);
 ZEND_API int bitwise_or_function(zval *result, zval *op1, zval *op2);