[xdebug-dev] xdebug xdebug/xdebug.c xdebug/xdebug_handler_dbgp.c - Fixed some Windows related warnings

Date: Wed Oct 20 09:35:46 CEST 2004
User: Derick Rethans
Directory: xdebug

Log Message:
[0.25]
- Fixed some Windows related warnings
- Hopefully fixed bug #95

Modified files:
           xdebug/xdebug.c (version: 1.242)
           xdebug/xdebug_handler_dbgp.c (version: 1.59)

[FILE: /xdebug/xdebug.c]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -r1.241 -r1.242
--- xdebug/xdebug.c:1.241 Tue Oct 12 12:49:29 2004 GMT
+++ xdebug/xdebug.c Wed Oct 20 05:35:46 2004 GMT
@@ -54,6 +54,7 @@
 #include "zend_extensions.h"
 #ifdef ZEND_ENGINE_2
 #include "zend_exceptions.h"
+#include "zend_vm.h"
 #endif
 
 #include "php_xdebug.h"
@@ -800,14 +801,8 @@
                 tmp->lineno = cur_opcode->lineno;
 
                 if (tmp->function.type == XFUNC_EVAL) {
- zval *param;
                         int is_var;
 
-/* tmp->var = xdmalloc(sizeof (xdebug_var));
- tmp->var[tmp->varc].name = NULL;
- tmp->var[tmp->varc].addr = param;
- tmp->varc++;
-*/
                         tmp->include_filename = get_zval_value(get_zval(&zdata->opline->op1, zdata->Ts, &is_var));
                 } else if (XG(collect_includes)) {
                         tmp->include_filename = xdstrdup(zend_get_executed_filename(TSRMLS_C));
@@ -1513,7 +1508,7 @@
         if (XG(profiler_enabled)) {
                 xdebug_profiler_deinit(TSRMLS_C);
         }
- old_exit_handler(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
+ return old_exit_handler(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 }
 #endif
 

[FILE: /xdebug/xdebug_handler_dbgp.c]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- xdebug/xdebug_handler_dbgp.c:1.58 Mon Aug 30 12:05:24 2004 GMT
+++ xdebug/xdebug_handler_dbgp.c Wed Oct 20 05:35:46 2004 GMT
@@ -1269,11 +1269,7 @@
 {
         function_stack_entry *fse;
         xdebug_hash *ht;
-#ifdef ZEND_ENGINE_2
- xdebug_xml_node *contents;
- zval ret_zval;
- int res;
-#endif
+
         if (context_id > 0) {
                 /* right now, we only have zero or one, one being globals, which is
                  * always the head of the stack */
@@ -1591,7 +1587,7 @@
 
 char *xdebug_dbgp_get_revision(void)
 {
- return "$Revision: 1.58 $";
+ return "$Revision: 1.59 $";
 }
 
 int xdebug_dbgp_cmdloop(xdebug_con *context TSRMLS_DC)
Received on Wed Oct 20 2004 - 09:35:50 BST