diff options
| author | Xinchen Hui <laruence@gmail.com> | 2020-05-13 18:23:55 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2020-05-13 18:23:55 +0800 |
| commit | ded0b34a481afdb322858c1e291646bc4b56a2a7 (patch) | |
| tree | d2c11efe15591fdb613b8e68e39b2ad91017bd70 /TSRM/tsrm_win32.c | |
| parent | 3d4e23aa928ae1451da360d64b849a0720412f7e (diff) | |
| parent | 1f05966a41f9bf732bc5b0af38a13b8a64d4e2a6 (diff) | |
| download | php-git-ded0b34a481afdb322858c1e291646bc4b56a2a7.tar.gz | |
Merge branch 'master' of git.php.net:/php-src
* 'master' of git.php.net:/php-src:
Use new Fast ZPP macros for string|int parar types
utime is always available on Windows
Diffstat (limited to 'TSRM/tsrm_win32.c')
| -rw-r--r-- | TSRM/tsrm_win32.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/TSRM/tsrm_win32.c b/TSRM/tsrm_win32.c index cccb0d3732..05c47d146a 100644 --- a/TSRM/tsrm_win32.c +++ b/TSRM/tsrm_win32.c @@ -769,7 +769,6 @@ TSRM_API int shmctl(int key, int cmd, struct shmid_ds *buf) } }/*}}}*/ -#if HAVE_UTIME static zend_always_inline void UnixTimeToFileTime(time_t t, LPFILETIME pft) /* {{{ */ { // Note that LONGLONG is a 64-bit value @@ -824,4 +823,3 @@ TSRM_API int win32_utime(const char *filename, struct utimbuf *buf) /* {{{ */ } /* }}} */ #endif -#endif |