Skip to content
Permalink
Browse files

Merge branch 'xdebug_2_1'

Conflicts:
	xdebug_stack.c
  • Loading branch information...
derickr committed Oct 1, 2011
2 parents 3d46e74 + 049d15f commit 00a00ea4512d414f0592675a7c91f5791868eb1a
Showing with 1 addition and 1 deletion.
  1. +1 −1 xdebug_stack.c
@@ -257,7 +257,7 @@ void xdebug_append_error_description(xdebug_str *str, int html, const char *erro
{
char **formats = select_formats(html TSRMLS_CC);
char *escaped;
#if PHP_VERSION_ID > 50400
#if PHP_VERSION_ID >= 50400
size_t newlen;
#else
int newlen;

0 comments on commit 00a00ea

Please sign in to comment.
You can’t perform that action at this time.