diff options
author | Pierre Joye <pajoye@php.net> | 2011-11-24 12:46:45 +0000 |
---|---|---|
committer | Pierre Joye <pajoye@php.net> | 2011-11-24 12:46:45 +0000 |
commit | 89193ecf61e2fef17e63683b9b77bce8b27f937b (patch) | |
tree | 4637ce5e28f4de35d8ae7e3faf037abe3f8f0e3d | |
parent | e0137255164d3eb544efd9737ebb5f76477e7f33 (diff) | |
download | php-git-89193ecf61e2fef17e63683b9b77bce8b27f937b.tar.gz |
- merge crt warning change (r216594) and rename the ini to windows.show_crt_warning
-rw-r--r-- | main/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/main.c b/main/main.c index cc7c078539..40c60298ca 100644 --- a/main/main.c +++ b/main/main.c @@ -514,7 +514,7 @@ PHP_INI_BEGIN() STD_PHP_INI_ENTRY("user_ini.cache_ttl", "300", PHP_INI_SYSTEM, OnUpdateLong, user_ini_cache_ttl, php_core_globals, core_globals) STD_PHP_INI_BOOLEAN("exit_on_timeout", "0", PHP_INI_ALL, OnUpdateBool, exit_on_timeout, php_core_globals, core_globals) #ifdef PHP_WIN32 - STD_PHP_INI_BOOLEAN("windows_show_crt_warning", "0", PHP_INI_ALL, OnUpdateBool, windows_show_crt_warning, php_core_globals, core_globals) + STD_PHP_INI_BOOLEAN("windows.show_crt_warning", "0", PHP_INI_ALL, OnUpdateBool, windows_show_crt_warning, php_core_globals, core_globals) #endif PHP_INI_END() /* }}} */ |