From: Anatol Belski <ab@php.net>
Date: Fri, 8 Dec 2017 15:47:39 +0000 (+0100)
Subject: Move declarations
X-Git-Tag: php-7.3.0alpha1~849
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c9274a4c6a592e26db7b682ebcf4d06f54fa2f6b;p=php

Move declarations
---

diff --git a/Zend/zend_virtual_cwd.h b/Zend/zend_virtual_cwd.h
index 5e41fe2742..bade843634 100644
--- a/Zend/zend_virtual_cwd.h
+++ b/Zend/zend_virtual_cwd.h
@@ -160,21 +160,6 @@ CWD_API int virtual_rmdir(const char *pathname);
 CWD_API DIR *virtual_opendir(const char *pathname);
 CWD_API FILE *virtual_popen(const char *command, const char *type);
 CWD_API int virtual_access(const char *pathname, int mode);
-#if defined(ZEND_WIN32)
-/* these are not defined in win32 headers */
-#ifndef W_OK
-#define W_OK 0x02
-#endif
-#ifndef R_OK
-#define R_OK 0x04
-#endif
-#ifndef X_OK
-#define X_OK 0x01
-#endif
-#ifndef F_OK
-#define F_OK 0x00
-#endif
-#endif
 
 #if HAVE_UTIME
 CWD_API int virtual_utime(const char *filename, struct utimbuf *buf);
diff --git a/win32/ioutil.h b/win32/ioutil.h
index 5e661fc096..e886e6febf 100644
--- a/win32/ioutil.h
+++ b/win32/ioutil.h
@@ -74,6 +74,20 @@ extern "C" {
 typedef unsigned short mode_t;
 #endif
 
+/* these are not defined in win32 headers */
+#ifndef W_OK
+#define W_OK 0x02
+#endif
+#ifndef R_OK
+#define R_OK 0x04
+#endif
+#ifndef X_OK
+#define X_OK 0x01
+#endif
+#ifndef F_OK
+#define F_OK 0x00
+#endif
+
 typedef struct {
 	DWORD access;
 	DWORD share;