diff options
| author | Anatol Belski <ab@php.net> | 2015-05-25 13:17:35 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-05-25 18:03:21 +0200 |
| commit | 5d1731b2fb5a2ed96fffddd9d3d5c3d1ae502eba (patch) | |
| tree | 391cea5635e3fbbe27220e187d91a64a380fa250 | |
| parent | c436e25fd5519bb26fea2385d858823be7e3fca2 (diff) | |
| download | php-git-5d1731b2fb5a2ed96fffddd9d3d5c3d1ae502eba.tar.gz | |
move some stat declarations into zend_virtual_cwd.h
more cleanup to go
| -rw-r--r-- | Zend/zend_virtual_cwd.h | 14 | ||||
| -rw-r--r-- | ext/standard/filestat.c | 12 |
2 files changed, 14 insertions, 12 deletions
diff --git a/Zend/zend_virtual_cwd.h b/Zend/zend_virtual_cwd.h index d7d1067828..7e066f0016 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 ffcba3598d..764b490b9a 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; |