cvs: php4 /main php_ini.c
| From: | Yasuo Ohgaki | Date: | Fri, 19 Apr 2002 05:48:24 +0000 |
| Subject: | cvs: php4 /main php_ini.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-11212@lists.php.net to get a copy of this message | ||
yohgaki Fri Apr 19 01:48:24 2002 EDT
Modified files:
/php4/main php_ini.c
Log:
Avoid defining/using S_ISDIR macro.
Index: php4/main/php_ini.c
diff -u php4/main/php_ini.c:1.84 php4/main/php_ini.c:1.85
--- php4/main/php_ini.c:1.84 Wed Apr 17 13:25:18 2002
+++ php4/main/php_ini.c Fri Apr 19 01:48:22 2002
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_ini.c,v 1.84 2002/04/17 17:25:18 sebastian Exp $ */
+/* $Id: php_ini.c,v 1.85 2002/04/19 05:48:22 yohgaki Exp $ */
#include "php.h"
#ifndef PHP_WIN32
@@ -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 @@
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");
}
}