[xdebug-dev] xdebug xdebug/xdebug.c xdebug/xdebug_handler_dbgp.c - only build zend2 stuff with zend2

Date: Tue Apr 20 03:52:04 CEST 2004
User: Shane Caraveo
Directory: xdebug

Log Message:
[0.15]
- only build zend2 stuff with zend2
- make the kill/stop stop/detach change that happend long ago

Modified files:
           xdebug/xdebug.c (version: 1.210)
           xdebug/xdebug_handler_dbgp.c (version: 1.39)

[FILE: /xdebug/xdebug.c]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -r1.209 -r1.210
--- xdebug/xdebug.c:1.209 Fri Apr 16 21:27:33 2004 GMT
+++ xdebug/xdebug.c Mon Apr 19 23:52:04 2004 GMT
@@ -51,7 +51,9 @@
 #include "zend_execute.h"
 #include "zend_compile.h"
 #include "zend_extensions.h"
+#ifdef ZEND_ENGINE_2
 #include "zend_exceptions.h"
+#endif
 
 #include "php_xdebug.h"
 #include "xdebug_private.h"
@@ -79,7 +81,9 @@
 void (*new_error_cb)(int type, const char *error_filename, const uint error_lineno, const char *format, va_list args);
 void xdebug_error_cb(int type, const char *error_filename, const uint error_lineno, const char *format, va_list args);
 
+#ifdef ZEND_ENGINE_2
 void xdebug_throw_exception_hook(zval *exception TSRMLS_DC);
+#endif
 
 static zval *get_zval(znode *node, temp_variable *Ts, int *is_var);
 static char* return_trace_stack_frame(function_stack_entry* i, int html TSRMLS_DC);

[FILE: /xdebug/xdebug_handler_dbgp.c]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- xdebug/xdebug_handler_dbgp.c:1.38 Fri Apr 16 21:27:33 2004 GMT
+++ xdebug/xdebug_handler_dbgp.c Mon Apr 19 23:52:04 2004 GMT
@@ -122,12 +122,12 @@
 DBGP_FUNC(stderr);
 DBGP_FUNC(stdout);
 
-DBGP_FUNC(kill);
+DBGP_FUNC(stop);
 DBGP_FUNC(run);
 DBGP_FUNC(step_into);
 DBGP_FUNC(step_out);
 DBGP_FUNC(step_over);
-DBGP_FUNC(stop);
+DBGP_FUNC(detach);
 
 /*****************************************************************************
 ** Dispatcher tables for supported debug commands
@@ -161,12 +161,12 @@
         DBGP_FUNC_ENTRY(stderr)
         DBGP_FUNC_ENTRY(stdout)
 
- DBGP_CONT_FUNC_ENTRY(kill)
+ DBGP_CONT_FUNC_ENTRY(stop)
         DBGP_CONT_FUNC_ENTRY(run)
         DBGP_CONT_FUNC_ENTRY(step_into)
         DBGP_CONT_FUNC_ENTRY(step_out)
         DBGP_CONT_FUNC_ENTRY(step_over)
- DBGP_CONT_FUNC_ENTRY(stop)
+ DBGP_CONT_FUNC_ENTRY(detach)
         { NULL, NULL }
 };
 
@@ -760,7 +760,7 @@
 }
 
 
-DBGP_FUNC(kill)
+DBGP_FUNC(stop)
 {
         zend_bailout();
 }
@@ -807,7 +807,7 @@
         }
 }
 
-DBGP_FUNC(stop)
+DBGP_FUNC(detach)
 {
         XG(remote_enabled) = 0;
 }
@@ -1328,7 +1328,7 @@
 
 char *xdebug_dbgp_get_revision(void)
 {
- return "$Revision: 1.38 $";
+ return "$Revision: 1.39 $";
 }
 
 int xdebug_dbgp_cmdloop(xdebug_con *context TSRMLS_DC)
Received on Tue Apr 20 2004 - 03:52:07 BST