com php-src: Move declarations: Zend/zend_virtual_cwd.h win32/ioutil.h

From: Date: Fri, 08 Dec 2017 20:41:25 +0000
Subject: com php-src: Move declarations: Zend/zend_virtual_cwd.h win32/ioutil.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-100531@lists.php.net to get a copy of this message
Commit: c9274a4c6a592e26db7b682ebcf4d06f54fa2f6b Author: Anatol Belski <ab@php.net> Fri, 8 Dec 2017 16:47:39 +0100 Parents: a9a49b8250c65e72281c7a7398b0b16a226c7ebc Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c9274a4c6a592e26db7b682ebcf4d06f54fa2f6b Log: Move declarations Changed paths: M Zend/zend_virtual_cwd.h M win32/ioutil.h Diff: diff --git a/Zend/zend_virtual_cwd.h b/Zend/zend_virtual_cwd.h index 5e41fe2..bade843 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 5e661fc..e886e6f 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;

« previous php.cvs (#100531) next »