Merge branch 'master' of git.php.net:php-src

Author: KalleZ

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 */

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)