[xdebug-dev] xdebug xdebug/php_xdebug.h xdebug/xdebug.c - Fixed bug #58: Xdebug 1.3.x doesn't compile with PHP 5.

Date: Sun Apr 18 01:35:33 CEST 2004
User: Derick Rethans
Directory: xdebug

Log Message:
[0.25]
- Fixed bug #58: Xdebug 1.3.x doesn't compile with PHP 5.

Modified files:
           xdebug/php_xdebug.h (version: 1.53.2.6)
           xdebug/xdebug.c (version: 1.157.2.8)

[FILE: /xdebug/php_xdebug.h]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.53.2.5
retrieving revision 1.53.2.6
diff -u -r1.53.2.5 -r1.53.2.6
--- xdebug/php_xdebug.h:1.53.2.5 Tue Apr 06 17:26:06 2004 GMT
+++ xdebug/php_xdebug.h Sat Apr 17 21:35:33 2004 GMT
@@ -19,7 +19,7 @@
 #ifndef PHP_XDEBUG_H
 #define PHP_XDEBUG_H
 
-#define XDEBUG_VERSION "1.3.1"
+#define XDEBUG_VERSION "1.3.2dev"
 
 #include "php.h"
 
@@ -63,7 +63,7 @@
 PHP_RSHUTDOWN_FUNCTION(xdebug);
 PHP_MINFO_FUNCTION(xdebug);
 #ifdef ZEND_ENGINE_2
-ZEND_MODULE_EXEC_FINISHED_D(xdebug);
+ZEND_MODULE_POST_ZEND_DEACTIVATE_D(xdebug);
 #endif
 
 /* call stack functions */

[FILE: /xdebug/xdebug.c]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.157.2.7
retrieving revision 1.157.2.8
diff -u -r1.157.2.7 -r1.157.2.8
--- xdebug/xdebug.c:1.157.2.7 Tue Dec 23 20:04:10 2003 GMT
+++ xdebug/xdebug.c Sat Apr 17 21:35:33 2004 GMT
@@ -118,11 +118,15 @@
         PHP_MINIT(xdebug),
         PHP_MSHUTDOWN(xdebug),
         PHP_RINIT(xdebug),
+#ifndef ZEND_ENGINE_2
         PHP_RSHUTDOWN(xdebug),
+#else
+ NULL,
+#endif
         PHP_MINFO(xdebug),
         XDEBUG_VERSION,
 #ifdef ZEND_ENGINE_2
- ZEND_MODULE_EXEC_FINISHED_N(xdebug),
+ ZEND_MODULE_POST_ZEND_DEACTIVATE_N(xdebug),
 #else
         NULL,
         NULL,
@@ -439,13 +443,19 @@
         return SUCCESS;
 }
 
-ZEND_MODULE_EXEC_FINISHED_D(xdebug)
+ZEND_MODULE_EXEC_POST_DEACTIVATE_D(xdebug)
 {
         return SUCCESS;
 }
 
+#ifdef ZEND_ENGINE_2
+ZEND_MODULE_POST_ZEND_DEACTIVATE_D(xdebug)
+{
+ TSRMLS_FETCH();
+#else
 PHP_RSHUTDOWN_FUNCTION(xdebug)
 {
+#endif
         if (XG(auto_profile) && XG(profile_file)) {
                 XG(auto_profile) = 2;
                 print_profile(0, XG(auto_profile_mode) TSRMLS_CC);
Received on Sun Apr 18 2004 - 01:35:34 BST