diff options
| author | Yasuo Ohgaki <yohgaki@php.net> | 2002-04-19 05:48:22 +0000 |
|---|---|---|
| committer | Yasuo Ohgaki <yohgaki@php.net> | 2002-04-19 05:48:22 +0000 |
| commit | e17161443a576e27a595d4336a28ebab9926abb7 (patch) | |
| tree | 72e46703caccdd8556b3641376d18fd8ac57b30c /main/php_ini.c | |
| parent | fedfdd2c1130bb9ac0724ba7e18138e702d20ba8 (diff) | |
| download | php-git-e17161443a576e27a595d4336a28ebab9926abb7.tar.gz | |
Avoid defining/using S_ISDIR macro.
Diffstat (limited to 'main/php_ini.c')
| -rw-r--r-- | main/php_ini.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/main/php_ini.c b/main/php_ini.c index 8e77345607..623d21d8b4 100644 --- a/main/php_ini.c +++ b/main/php_ini.c @@ -31,10 +31,6 @@ #include "SAPI.h" #include "php_main.h" -#ifndef S_ISDIR -#define S_ISDIR( m ) (((m) & S_IFMT) == S_IFDIR) -#endif - typedef struct _php_extension_lists { zend_llist engine; zend_llist functions; @@ -272,7 +268,7 @@ int php_init_config(char *php_ini_path_override) if (php_ini_path_override && php_ini_path_override[0]) { struct stat statbuf; if (!VCWD_STAT(php_ini_path_override, &statbuf)) { - if (!S_ISDIR(statbuf.st_mode)) { + if (!((statbuf.st_mode & S_IFMT) == S_IFDIR)) { fh.handle.fp = VCWD_FOPEN(php_ini_path_override, "r"); } } |