Merge branch 'xdebug_2_1'

derickr · Apr 11, 2012 · 70baf1a · 70baf1a
2 parents 8ea0093 + f572a93
commit 70baf1a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/xdebug.c b/xdebug.c
@@ -369,7 +369,7 @@ char *xdebug_env_key(TSRMLS_D)
 	}
 }
 
-void xdebug_env_config()
+void xdebug_env_config(TSRMLS_D)
 {
 	char       *config = getenv("XDEBUG_CONFIG");
 	xdebug_arg *parts;
@@ -807,7 +807,7 @@ PHP_RINIT_FUNCTION(xdebug)
 
 	/* Get xdebug ini entries from the environment also,
 	   this can override the idekey if one is set */
-	xdebug_env_config();
+	xdebug_env_config(TSRMLS_C);
 
 	XG(no_exec)       = 0;
 	XG(level)         = 0;