move the defs to the right place

diff --git a/Zend/zend_virtual_cwd.h b/Zend/zend_virtual_cwd.h
index 538a2f8a73022150e29bfb7b72a3ccfeaa536c0c..970e65e0b79f7464a83032fdd3c86a7b1d1efe2f 100644 (file)
--- 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 70ee7777bd9ee4c7c5d6dd66259041a78fbfe0ac..5a45e24ea46bcf3cb6ff8b8a10ddd39d0637d21b 100644 (file)
--- 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)