diff options
| author | Anatol Belski <ab@php.net> | 2016-12-22 02:17:55 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-12-22 02:17:55 +0100 |
| commit | 837cce3b0b3fdf632da9935f45adeea4766ff1f8 (patch) | |
| tree | e8a0efc701c8be75f0cb0fe773027e6744e507ba | |
| parent | 5d7ce7274757451a536b3521debd8f89365b0349 (diff) | |
| download | php-git-837cce3b0b3fdf632da9935f45adeea4766ff1f8.tar.gz | |
move the defs to the right place
| -rw-r--r-- | Zend/zend_virtual_cwd.h | 14 | ||||
| -rw-r--r-- | main/win95nt.h | 8 |
2 files changed, 13 insertions, 9 deletions
diff --git a/Zend/zend_virtual_cwd.h b/Zend/zend_virtual_cwd.h index 538a2f8a73..970e65e0b7 100644 --- a/Zend/zend_virtual_cwd.h +++ b/Zend/zend_virtual_cwd.h @@ -342,7 +342,8 @@ CWD_API realpath_cache_bucket** realpath_cache_get_buckets(void); #endif #ifndef S_IFLNK -# define S_IFLNK 0120000 +#define _IFLNK 0120000 /* symbolic link */ +#define S_IFLNK _IFLNK #endif #ifndef S_ISDIR @@ -361,4 +362,15 @@ CWD_API realpath_cache_bucket** realpath_cache_get_buckets(void); #define S_IXROOT ( S_IXUSR | S_IXGRP | S_IXOTH ) #endif +/* XXX should be _S_IFIFO? */ +#ifndef S_IFIFO +#define _IFIFO 0010000 /* fifo */ +#define S_IFIFO _IFIFO +#endif + +#ifndef S_IFBLK +#define _IFBLK 0060000 /* block special */ +#define S_IFBLK _IFBLK +#endif + #endif /* VIRTUAL_CWD_H */ diff --git a/main/win95nt.h b/main/win95nt.h index 70ee7777bd..5a45e24ea4 100644 --- a/main/win95nt.h +++ b/main/win95nt.h @@ -34,14 +34,6 @@ typedef int uid_t; typedef int gid_t; typedef char * caddr_t; #define lstat(x, y) php_sys_lstat(x, y) -#define _IFIFO 0010000 /* fifo */ -#define _IFBLK 0060000 /* block special */ -#define _IFLNK 0120000 /* symbolic link */ -#define S_IFIFO _IFIFO -#define S_IFBLK _IFBLK -#ifndef S_IFLNK -# define S_IFLNK _IFLNK -#endif #define chdir(path) _chdir(path) #define mkdir(a, b) _mkdir(a) #define rmdir(a) _rmdir(a) |