[xdebug-dev] xdebug xdebug/xdebug.c xdebug/xdebug_profiler.c - Make this compile with PHP 4.3/4.4 again.

Date: Tue Aug 29 11:18:55 CEST 2006
User: Derick Rethans
Directory: xdebug

Log Message:
[0.25]
- Make this compile with PHP 4.3/4.4 again.

Modified files:
           xdebug/xdebug.c (version: 1.332)
           xdebug/xdebug_profiler.c (version: 1.40)

[FILE: /xdebug/xdebug.c]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.331
retrieving revision 1.332
diff -u -r1.331 -r1.332
--- xdebug/xdebug.c:1.331 Mon Aug 28 17:53:32 2006 GMT
+++ xdebug/xdebug.c Tue Aug 29 07:18:54 2006 GMT
@@ -533,6 +533,7 @@
         old_error_cb = zend_error_cb;
         new_error_cb = xdebug_error_cb;
 
+#ifdef ZEND_ENGINE_2
         /* Overload the "exit" opcode */
         XDEBUG_SET_OPCODE_OVERRIDE(exit, ZEND_EXIT);
         XDEBUG_SET_OPCODE_OVERRIDE(jmp, ZEND_JMP);
@@ -546,6 +547,7 @@
         XDEBUG_SET_OPCODE_OVERRIDE(assign, ZEND_ASSIGN);
         XDEBUG_SET_OPCODE_OVERRIDE(add_array_element, ZEND_ADD_ARRAY_ELEMENT);
         XDEBUG_SET_OPCODE_OVERRIDE(return, ZEND_RETURN);
+#endif
 
         if (zend_xdebug_initialised == 0) {
                 zend_error(E_WARNING, "Xdebug MUST be loaded as a Zend extension");

[FILE: /xdebug/xdebug_profiler.c]

===================================================================
RCS file: cvstemp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- xdebug/xdebug_profiler.c:1.39 Fri Aug 11 05:15:44 2006 GMT
+++ xdebug/xdebug_profiler.c Tue Aug 29 07:18:54 2006 GMT
@@ -65,7 +65,7 @@
                 filename = xdebug_sprintf("%s/cachegrind.out.%lu", XG(profiler_output_dir), xdebug_crc32(script_name, strlen(script_name)));
         } else if (strcmp(XG(profiler_output_name), "timestamp") == 0) {
                 time_t the_time = time(NULL);
- filename = xdebug_sprintf("%s/cachegrind.out.%ld", XG(profiler_output_dir), the_time);
+ filename = xdebug_sprintf("%s/cachegrind.out.%ld%d", XG(profiler_output_dir), the_time, php_combined_lcg(TSRMLS_C));
         } else if (strcmp(XG(profiler_output_name), "script") == 0) {
                 script_name_tmp = estrdup(script_name + 1);
                 /* replace slashes with underscores */
Received on Tue Aug 29 2006 - 11:18:58 BST