Merge branch 'xdebug_2_5'

xdebug · Apr 21, 2017 · 0bfbb9e · 0bfbb9e
2 parents 35692c8 + 2862119
commit 0bfbb9e
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/xdebug.c b/xdebug.c
@@ -1050,7 +1050,7 @@ static void xdebug_init_auto_globals(TSRMLS_D)
 }
 
 
-static void xdebug_overloaded_functions_setup(TSRMLS_C)
+static void xdebug_overloaded_functions_setup(TSRMLS_D)
 {
 	zend_function *orig;
 
@@ -1074,7 +1074,7 @@ static void xdebug_overloaded_functions_setup(TSRMLS_C)
 	}
 }
 
-static void xdebug_overloaded_functions_restore(TSRMLS_C)
+static void xdebug_overloaded_functions_restore(TSRMLS_D)
 {
 	zend_function *orig;
 
@@ -1202,7 +1202,7 @@ PHP_RINIT_FUNCTION(xdebug)
 	XG(start_time) = xdebug_get_utime();
 
 	/* Overload var_dump, set_time_limit, and pcntl_exec */
-	xdebug_overloaded_functions_setup(TSRMLS_DC);
+	xdebug_overloaded_functions_setup(TSRMLS_C);
 
 	XG(headers) = xdebug_llist_alloc(xdebug_llist_string_dtor);
 
@@ -1297,7 +1297,7 @@ ZEND_MODULE_POST_ZEND_DEACTIVATE_D(xdebug)
 	}
 
 	/* Restore original var_dump, set_time_limit, and pcntl_exec handlers */
-	xdebug_overloaded_functions_restore(TSRMLS_DC);
+	xdebug_overloaded_functions_restore(TSRMLS_C);
 
 	/* Clean up collected headers */
 	xdebug_llist_destroy(XG(headers), NULL);