summaryrefslogtreecommitdiff
path: root/main/configuration-parser.y
diff options
context:
space:
mode:
authorZeev Suraski <zeev@php.net>2000-02-11 15:59:30 +0000
committerZeev Suraski <zeev@php.net>2000-02-11 15:59:30 +0000
commit80bdd19e031ca0dac2dfd4cb62ff43558d477663 (patch)
tree539fd5059d50e32acf9b991354d48cbcecb16426 /main/configuration-parser.y
parent80f4886c5a71b0cdc4a3159297160e30ddd298cb (diff)
downloadphp-git-80bdd19e031ca0dac2dfd4cb62ff43558d477663.tar.gz
Fine tune Andi's patch
Diffstat (limited to 'main/configuration-parser.y')
-rw-r--r--main/configuration-parser.y6
1 files changed, 3 insertions, 3 deletions
diff --git a/main/configuration-parser.y b/main/configuration-parser.y
index 88804694fd..0991c1e569 100644
--- a/main/configuration-parser.y
+++ b/main/configuration-parser.y
@@ -161,7 +161,7 @@ int php_init_config(void)
if (!env_location) {
env_location="";
}
-#if PHP_WIN32
+#ifdef PHP_WIN32
{
if (php_ini_path) {
default_location = php_ini_path;
@@ -186,7 +186,7 @@ int php_init_config(void)
php_ini_search_path = (char *) malloc(sizeof(".")+strlen(env_location)+strlen(default_location)+2+1);
if (!php_ini_path) {
-#if PHP_WIN32
+#ifdef PHP_WIN32
sprintf(php_ini_search_path,".;%s;%s",env_location,default_location);
#else
sprintf(php_ini_search_path,".:%s:%s",env_location,default_location);
@@ -206,7 +206,7 @@ int php_init_config(void)
PG(open_basedir) = open_basedir;
if (!cfgin) {
-# if PHP_WIN32
+# ifdef PHP_WIN32
return FAILURE;
# else
return SUCCESS; /* having no configuration file is ok */