From: Anatol Belski <ab@php.net>
Date: Mon, 25 May 2015 11:28:18 +0000 (+0200)
Subject: cleanup more redundant S_IS* declarations
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~32^2~14
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cfadcfc73486828b53ec45217fd00659a1a2e918;p=php

cleanup more redundant S_IS* declarations
---

diff --git a/ext/opcache/zend_accelerator_module.c b/ext/opcache/zend_accelerator_module.c
index 13118a0a4e..7a8ef8d3e8 100644
--- 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 568fc9f2d1..b07d6858da 100644
--- 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 1d4f235277..8a40f7f506 100644
--- 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"