From: Yasuo Ohgaki <yohgaki@php.net>
Date: Fri, 19 Apr 2002 05:48:22 +0000 (+0000)
Subject: Avoid defining/using S_ISDIR macro.
X-Git-Tag: php-4.3.0dev-ZendEngine2-Preview1~585
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e17161443a576e27a595d4336a28ebab9926abb7;p=php

Avoid defining/using S_ISDIR macro.
---

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");
 			}
 		}