cleanup more redundant S_IS* declarations

diff --git a/ext/opcache/zend_accelerator_module.c b/ext/opcache/zend_accelerator_module.c
index 13118a0a4e9e6757ddc856456d34c2a837a43090..7a8ef8d3e8aa909764047736758094b4493657f5 100644 (file)
--- a/ext/opcache/zend_accelerator_module.c
+++ b/ext/opcache/zend_accelerator_module.c
@@ -243,10 +243,6 @@ static ZEND_INI_MH(OnEnable)
 
 #ifdef HAVE_OPCACHE_FILE_CACHE
 
-#ifndef S_ISDIR
-# define S_ISDIR(mode) (((mode)&S_IFMT) == S_IFDIR)
-#endif
-
 static ZEND_INI_MH(OnUpdateFileCache)
 {
        if (new_value) {

diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c
index 568fc9f2d1a1ef37a0e5286ec40814270c92d60a..b07d6858da3ae478a371f1ab3c032e4b5a0897c7 100644 (file)
--- a/sapi/cli/php_cli_server.c
+++ b/sapi/cli/php_cli_server.c
@@ -91,10 +91,6 @@
 # define SOCK_EADDRINUSE WSAEADDRINUSE
 #endif
 
-#ifndef S_ISDIR
-#define S_ISDIR(mode)  (((mode)&S_IFMT) == S_IFDIR)
-#endif
-
 #include "ext/standard/file.h" /* for php_set_sock_blocking() :-( */
 #include "zend_smart_str.h"
 #include "ext/standard/html.h"

diff --git a/win32/glob.c b/win32/glob.c
index 1d4f23527735cde03526081f1259e3a89122f373..8a40f7f506228d4f23bc6a4b94ba1422ba9c20d7 100644 (file)
--- a/win32/glob.c
+++ b/win32/glob.c
@@ -71,12 +71,6 @@
 #  define ARG_MAX 14500
 # endif
 #endif
-#ifndef S_ISDIR
-#define S_ISDIR(m) (((m) & _S_IFDIR) == _S_IFDIR)
-#endif
-#ifndef S_ISLNK
-#define S_ISLNK(m) (0)
-#endif
 #endif
 
 #include "php.h"