com php-src: move the defs to the right place: Zend/zend_virt ual_cwd.h main/win95nt.h

Commit: 837cce3b0b3fdf632da9935f45adeea4766ff1f8 Author: Anatol Belski <ab@php.net> Thu, 22 Dec 2016 02:17:55 +0100 Parents: 5d7ce7274757451a536b3521debd8f89365b0349 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=837cce3b0b3fdf632da9935f45adeea4766ff1f8 Log: move the defs to the right place Changed paths: M Zend/zend_virtual_cwd.h M main/win95nt.h Diff: diff --git a/Zend/zend_virtual_cwd.h b/Zend/zend_virtual_cwd.h index 538a2f8..970e65e 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 70ee777..5a45e24 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)