com php-src: move some stat declarations into zend_virtual_ cwd.h: Zend/zend_virtual_cwd.h ext/standard/files tat.c

Commit: 5d1731b2fb5a2ed96fffddd9d3d5c3d1ae502eba Author: Anatol Belski <ab@php.net> Mon, 25 May 2015 13:17:35 +0200 Parents: c436e25fd5519bb26fea2385d858823be7e3fca2 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5d1731b2fb5a2ed96fffddd9d3d5c3d1ae502eba Log: move some stat declarations into zend_virtual_cwd.h more cleanup to go Changed paths: M Zend/zend_virtual_cwd.h M ext/standard/filestat.c Diff: diff --git a/Zend/zend_virtual_cwd.h b/Zend/zend_virtual_cwd.h index d7d1067..7e066f0 100644 --- a/Zend/zend_virtual_cwd.h +++ b/Zend/zend_virtual_cwd.h @@ -337,4 +337,18 @@ CWD_API realpath_cache_bucket** realpath_cache_get_buckets(void); #endif +#ifndef S_ISDIR +#define S_ISDIR(mode) (((mode)&S_IFMT) == S_IFDIR) +#endif + +#ifndef S_ISREG +#define S_ISREG(mode) (((mode)&S_IFMT) == S_IFREG) +#endif + +#ifndef S_ISLNK +#define S_ISLNK(mode) (((mode)&S_IFMT) == S_IFLNK) +#endif + +#define S_IXROOT ( S_IXUSR | S_IXGRP | S_IXOTH ) + #endif /* VIRTUAL_CWD_H */ diff --git a/ext/standard/filestat.c b/ext/standard/filestat.c index ffcba35..764b490 100644 --- a/ext/standard/filestat.c +++ b/ext/standard/filestat.c @@ -85,18 +85,6 @@ #include "basic_functions.h" #include "php_filestat.h" -#ifndef S_ISDIR -#define S_ISDIR(mode) (((mode)&S_IFMT) == S_IFDIR) -#endif -#ifndef S_ISREG -#define S_ISREG(mode) (((mode)&S_IFMT) == S_IFREG) -#endif -#ifndef S_ISLNK -#define S_ISLNK(mode) (((mode)&S_IFMT) == S_IFLNK) -#endif - -#define S_IXROOT ( S_IXUSR | S_IXGRP | S_IXOTH ) - PHP_RINIT_FUNCTION(filestat) /* {{{ */ { BG(CurrentStatFile)=NULL;