- Updated unary_op_type typedef with TSRMLS_DC

- Added binary_op_type typedef
- Added missing ZEND_BOOL_XOR to get_binary_op()

diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h
index 2fa310562b6f8a24b1c226953caaebf586c9a1ce..83d9cb5bb3eae1c40acb482a97ecef0def7ac097 100644 (file)
--- a/Zend/zend_compile.h
+++ b/Zend/zend_compile.h
@@ -394,9 +394,10 @@ void fetch_string_offset(znode *result, const znode *parent, const znode *offset
 void zend_do_fetch_static_member(znode *result, znode *class_znode TSRMLS_DC);
 void zend_do_print(znode *result, const znode *arg TSRMLS_DC);
 void zend_do_echo(const znode *arg, zend_bool inline_html TSRMLS_DC);
-typedef int (*unary_op_type)(zval *, zval *);
+typedef int (*unary_op_type)(zval *, zval * TSRMLS_DC);
+typedef int (*binary_op_type)(zval *, zval *, zval * TSRMLS_DC);
 ZEND_API unary_op_type get_unary_op(int opcode);
-ZEND_API void *get_binary_op(int opcode);
+ZEND_API binary_op_type get_binary_op(int opcode);
 
 void zend_do_while_cond(const znode *expr, znode *close_bracket_token TSRMLS_DC);
 void zend_do_while_end(const znode *while_token, const znode *close_bracket_token TSRMLS_DC);

diff --git a/Zend/zend_opcode.c b/Zend/zend_opcode.c
index a5da22afe5de22d3c51a28cca9bd28dfeea46147..230c7f2610bbdd3fc3e0a04a34969d54f2fe01a0 100644 (file)
--- a/Zend/zend_opcode.c
+++ b/Zend/zend_opcode.c
@@ -495,73 +495,76 @@ ZEND_API unary_op_type get_unary_op(int opcode) /* {{{ */
 }
 /* }}} */
 
-ZEND_API void *get_binary_op(int opcode) /* {{{ */
+ZEND_API binary_op_type get_binary_op(int opcode) /* {{{ */
 {
        switch (opcode) {
                case ZEND_ADD:
                case ZEND_ASSIGN_ADD:
-                       return (void *) add_function;
+                       return (binary_op_type) add_function;
                        break;
                case ZEND_SUB:
                case ZEND_ASSIGN_SUB:
-                       return (void *) sub_function;
+                       return (binary_op_type) sub_function;
                        break;
                case ZEND_MUL:
                case ZEND_ASSIGN_MUL:
-                       return (void *) mul_function;
+                       return (binary_op_type) mul_function;
                        break;
                case ZEND_DIV:
                case ZEND_ASSIGN_DIV:
-                       return (void *) div_function;
+                       return (binary_op_type) div_function;
                        break;
                case ZEND_MOD:
                case ZEND_ASSIGN_MOD:
-                       return (void *) mod_function;
+                       return (binary_op_type) mod_function;
                        break;
                case ZEND_SL:
                case ZEND_ASSIGN_SL:
-                       return (void *) shift_left_function;
+                       return (binary_op_type) shift_left_function;
                        break;
                case ZEND_SR:
                case ZEND_ASSIGN_SR:
-                       return (void *) shift_right_function;
+                       return (binary_op_type) shift_right_function;
                        break;
                case ZEND_CONCAT:
                case ZEND_ASSIGN_CONCAT:
-                       return (void *) concat_function;
+                       return (binary_op_type) concat_function;
                        break;
                case ZEND_IS_IDENTICAL:
-                       return (void *) is_identical_function;
+                       return (binary_op_type) is_identical_function;
                        break;
                case ZEND_IS_NOT_IDENTICAL:
-                       return (void *) is_not_identical_function;
+                       return (binary_op_type) is_not_identical_function;
                        break;
                case ZEND_IS_EQUAL:
-                       return (void *) is_equal_function;
+                       return (binary_op_type) is_equal_function;
                        break;
                case ZEND_IS_NOT_EQUAL:
-                       return (void *) is_not_equal_function;
+                       return (binary_op_type) is_not_equal_function;
                        break;
                case ZEND_IS_SMALLER:
-                       return (void *) is_smaller_function;
+                       return (binary_op_type) is_smaller_function;
                        break;
                case ZEND_IS_SMALLER_OR_EQUAL:
-                       return (void *) is_smaller_or_equal_function;
+                       return (binary_op_type) is_smaller_or_equal_function;
                        break;
                case ZEND_BW_OR:
                case ZEND_ASSIGN_BW_OR:
-                       return (void *) bitwise_or_function;
+                       return (binary_op_type) bitwise_or_function;
                        break;
                case ZEND_BW_AND:
                case ZEND_ASSIGN_BW_AND:
-                       return (void *) bitwise_and_function;
+                       return (binary_op_type) bitwise_and_function;
                        break;
                case ZEND_BW_XOR:
                case ZEND_ASSIGN_BW_XOR:
-                       return (void *) bitwise_xor_function;
+                       return (binary_op_type) bitwise_xor_function;
+                       break;
+               case ZEND_BOOL_XOR:
+                       return (binary_op_type) boolean_xor_function;
                        break;
                default:
-                       return (void *) NULL;
+                       return (binary_op_type) NULL;
                        break;
        }
 }