[xdebug-dev] svn: /xdebug/ branches/xdebug_2_1/xdebug_stack.c trunk/xdebug_stack.c

derick Thu, 24 Mar 2011 10:22:53 +0000

Revision: http://svn.xdebug.org/cgi-bin/viewvc.cgi?view=rev&revision=3425&root=xdebug

Log:
- Fixed ZTS compilation.

Changed paths:
    U xdebug/branches/xdebug_2_1/xdebug_stack.c
    U xdebug/trunk/xdebug_stack.c

Modified: xdebug/branches/xdebug_2_1/xdebug_stack.c
===================================================================
--- xdebug/branches/xdebug_2_1/xdebug_stack.c 2011-03-22 18:25:12 UTC (rev 3424)
+++ xdebug/branches/xdebug_2_1/xdebug_stack.c 2011-03-24 10:22:53 UTC (rev 3425)
@@ -440,7 +440,7 @@
         }
 }

-static void php_output_error(const char *error)
+static void php_output_error(const char *error TSRMLS_DC)
 {
 #ifdef PHP_DISPLAY_ERRORS_STDERR
         if (PG(display_errors) == PHP_DISPLAY_ERRORS_STDERR) {
@@ -551,13 +551,13 @@
                                 xdebug_append_printable_stack(&str, PG(html_errors) TSRMLS_CC);
                                 xdebug_str_add(&str, XG(last_exception_trace), 0);
                                 xdebug_append_error_footer(&str, PG(html_errors));
- php_output_error(str.d);
+ php_output_error(str.d TSRMLS_CC);

                                 xdfree(str.d);
                                 free(tmp_buf);
                         } else {
                                 printable_stack = get_printable_stack(PG(html_errors), error_type_str, buffer, error_filename, error_lineno TSRMLS_CC);
- php_output_error(printable_stack);
+ php_output_error(printable_stack TSRMLS_CC);
                                 xdfree(printable_stack);
                         }
                 }

Modified: xdebug/trunk/xdebug_stack.c
===================================================================
--- xdebug/trunk/xdebug_stack.c 2011-03-22 18:25:12 UTC (rev 3424)
+++ xdebug/trunk/xdebug_stack.c 2011-03-24 10:22:53 UTC (rev 3425)
@@ -480,7 +480,7 @@
         }
 }

-static void php_output_error(const char *error)
+static void php_output_error(const char *error TSRMLS_DC)
 {
 #ifdef PHP_DISPLAY_ERRORS_STDERR
         if (PG(display_errors) == PHP_DISPLAY_ERRORS_STDERR) {
@@ -591,13 +591,13 @@
                                 xdebug_append_printable_stack(&str, PG(html_errors) TSRMLS_CC);
                                 xdebug_str_add(&str, XG(last_exception_trace), 0);
                                 xdebug_append_error_footer(&str, PG(html_errors) TSRMLS_CC);
- php_output_error(str.d);
+ php_output_error(str.d TSRMLS_CC);

                                 xdfree(str.d);
                                 free(tmp_buf);
                         } else {
                                 printable_stack = get_printable_stack(PG(html_errors), error_type_str, buffer, error_filename, error_lineno TSRMLS_CC);
- php_output_error(printable_stack);
+ php_output_error(printable_stack TSRMLS_CC);
                                 xdfree(printable_stack);
                         }
                 }
Received on Thu Mar 24 2011 - 10:22:53 GMT