com php-src: cleanup more redundant S_IS* declarations: ext/opcache/zend_accelerator_module.c sapi/cli/php _cli_server.c win32/glob.c

Commit: cfadcfc73486828b53ec45217fd00659a1a2e918 Author: Anatol Belski <ab@php.net> Mon, 25 May 2015 13:28:18 +0200 Parents: d713fcc14df11b81504ec5a4b743242912a31108 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=cfadcfc73486828b53ec45217fd00659a1a2e918 Log: cleanup more redundant S_IS* declarations Changed paths: M ext/opcache/zend_accelerator_module.c M sapi/cli/php_cli_server.c M win32/glob.c Diff: diff --git a/ext/opcache/zend_accelerator_module.c b/ext/opcache/zend_accelerator_module.c index 13118a0..7a8ef8d 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 568fc9f..b07d685 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 1d4f235..8a40f7f 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"