[xdebug-dev] xdebug xdebug/xdebug_code_coverage.c - fix xdebug builds against 4.4.

Date: Fri Nov 30 23:19:51 CET 2007
User: Shane Caraveo
Directory: xdebug

Log Message:
[.2]
- fix xdebug builds against 4.4.

Derick, can you verify what *should* be done for 4.x?
Modified files:
           xdebug/xdebug_code_coverage.c (version: 1.39)

[FILE: /xdebug/xdebug_code_coverage.c]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- xdebug/xdebug_code_coverage.c:1.38 Mon Nov 12 21:26:57 2007 GMT
+++ xdebug/xdebug_code_coverage.c Fri Nov 30 21:19:51 2007 GMT
@@ -144,7 +144,13 @@
         } else if (opcode.opcode == ZEND_BRK || opcode.opcode == ZEND_CONT) {
                 zend_brk_cont_element *el;
 
- if (opcode.op2.op_type == IS_CONST && opcode.op1.u.jmp_addr != (zend_op*) 0xFFFFFFFF) {
+ if (opcode.op2.op_type == IS_CONST
+#ifdef ZEND_ENGINE_2
+ && opcode.op1.u.jmp_addr != (zend_op*) 0xFFFFFFFF
+#else
+ && opcode.op1.u.opline_num > -1
+#endif
+ ) {
                         el = xdebug_find_brk_cont(&opcode.op2.u.constant, opcode.op1.u.opline_num, opa);
                         *jmp1 = opcode.opcode == ZEND_BRK ? el->brk : el->cont;
                         return 1;
Received on Fri Nov 30 2007 - 23:21:12 GMT