summaryrefslogtreecommitdiff
path: root/sapi/cli
diff options
context:
space:
mode:
Diffstat (limited to 'sapi/cli')
-rw-r--r--sapi/cli/config.w324
-rw-r--r--sapi/cli/php_cli.c3
2 files changed, 4 insertions, 3 deletions
diff --git a/sapi/cli/config.w32 b/sapi/cli/config.w32
index cd106f197..1a210ab68 100644
--- a/sapi/cli/config.w32
+++ b/sapi/cli/config.w32
@@ -1,8 +1,8 @@
// vim:ft=javascript
-// $Id: config.w32 243567 2007-10-05 16:00:30Z rrichards $
+// $Id: config.w32 302123 2010-08-11 22:38:15Z kalle $
ARG_ENABLE('cli', 'Build CLI version of PHP', 'yes');
-ARG_ENABLE('crt-debug', 'Extra CRT debugging', 'no');
+ARG_ENABLE('crt-debug', 'Enable CRT memory dumps for debugging sent to STDERR', 'no');
ARG_ENABLE('cli-win32', 'Build console-less CLI version of PHP', 'no');
if (PHP_CLI == "yes") {
diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
index cdc3ecf4a..dced2630d 100644
--- a/sapi/cli/php_cli.c
+++ b/sapi/cli/php_cli.c
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_cli.c 300854 2010-06-29 11:37:13Z felipe $ */
+/* $Id: php_cli.c 303357 2010-09-14 10:36:21Z pajoye $ */
#include "php.h"
#include "php_globals.h"
@@ -100,6 +100,7 @@
#endif
PHPAPI extern char *php_ini_opened_path;
+PHPAPI extern char *php_ini_scanned_path;
PHPAPI extern char *php_ini_scanned_files;
#ifndef O_BINARY