diff options
| author | Peter Kokot <peterkokot@gmail.com> | 2019-04-29 00:55:59 +0200 |
|---|---|---|
| committer | Peter Kokot <peterkokot@gmail.com> | 2019-04-29 00:55:59 +0200 |
| commit | cabd8c12d463682156d2362d9f1858badf5c90d6 (patch) | |
| tree | 6992182495d6ba5cbbcfc42c93de7b9d3df42fe9 | |
| parent | ba90675f823c0c3f2a0cbd1a21e40645c33b596f (diff) | |
| parent | b931dacc888ed59ccae6598338fe604030c251d6 (diff) | |
| download | php-git-cabd8c12d463682156d2362d9f1858badf5c90d6.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove unused TSRM/readdir.h header
| -rw-r--r-- | TSRM/readdir.h | 3 | ||||
| -rw-r--r-- | Zend/zend_virtual_cwd.h | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/TSRM/readdir.h b/TSRM/readdir.h deleted file mode 100644 index 11c0f31ea1..0000000000 --- a/TSRM/readdir.h +++ /dev/null @@ -1,3 +0,0 @@ -/* Keep this header for compatibility with external code, it's currently not - used anywhere in the core and there are no implementations in TSRM. */ -#include "win32/readdir.h" diff --git a/Zend/zend_virtual_cwd.h b/Zend/zend_virtual_cwd.h index dd8567cc51..a8cdcdc6f5 100644 --- a/Zend/zend_virtual_cwd.h +++ b/Zend/zend_virtual_cwd.h @@ -49,7 +49,7 @@ #endif #ifdef ZEND_WIN32 -#include "readdir.h" +#include "win32/readdir.h" #include <sys/utime.h> #include "win32/ioutil.h" /* mode_t isn't defined on Windows */ |