[xdebug-dev] xdebug xdebug/xdebug.c should be safe.

Date: Wed Sep 21 10:28:37 CEST 2005
User: Derick Rethans
Directory: xdebug

Log Message:
- Update defines so that it works with the latest CVS versions only, which
  should be safe.

Modified files:
           xdebug/xdebug.c (version: 1.273)

[FILE: /xdebug/xdebug.c]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.272
retrieving revision 1.273
diff -u -r1.272 -r1.273
--- xdebug/xdebug.c:1.272 Tue Aug 30 06:55:25 2005 GMT
+++ xdebug/xdebug.c Wed Sep 21 06:28:37 2005 GMT
@@ -932,16 +932,18 @@
                 cur_opcode = *EG(opline_ptr);
                 tmp->lineno = cur_opcode->lineno;
 
+#if (PHP_MAJOR_VERSION == 6) || \
+ (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION == 1) || \
+ (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION == 0 && PHP_MINI_VERSION > 5) || \
+ (PHP_MAJOR_VERSION == 4 && PHP_MINOR_VERSION == 4 && PHP_MINI_VERSION > 0)
                 if (tmp->function.type == XFUNC_EVAL) {
                         int is_var;
 
-#if (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION == 0) || PHP_MAJOR_VERSION == 4
                         tmp->include_filename = get_zval_value(get_zval(&zdata->opline->op1, zdata->Ts, &is_var), 0);
-#endif
                 } else if (XG(collect_includes)) {
                         tmp->include_filename = xdstrdup(zend_get_executed_filename(TSRMLS_C));
                 }
-
+#endif
         } else {
                 if (EG(opline_ptr)) {
                         cur_opcode = *EG(opline_ptr);
Received on Wed Sep 21 2005 - 10:28:45 BST