diff options
| author | krakjoe <joe.watkins@live.co.uk> | 2014-11-25 08:37:02 +0000 |
|---|---|---|
| committer | krakjoe <joe.watkins@live.co.uk> | 2014-11-25 08:37:02 +0000 |
| commit | e07feeaf8b91f16a89e9903b461042a0f6a63ac0 (patch) | |
| tree | 4a94cd382fcffefff920f7733562e1860a66cc44 /win32/time.h | |
| parent | 9b6836ebd36eccc9e81ca51e2efe172e1d334f0b (diff) | |
| parent | d4f42289ddde002cb4d3ed9d1a4f2219f68df48e (diff) | |
| download | php-git-e07feeaf8b91f16a89e9903b461042a0f6a63ac0.tar.gz | |
Merge branch 'master' of https://github.com/php/php-src
Diffstat (limited to 'win32/time.h')
| -rw-r--r-- | win32/time.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/win32/time.h b/win32/time.h index d5d86eb1ed..8f39c0481c 100644 --- a/win32/time.h +++ b/win32/time.h @@ -28,7 +28,7 @@ struct itimerval { struct timeval it_value; /* current value */ }; -#ifndef timespec +#if !defined(timespec) && _MSC_VER < 1900 struct timespec { time_t tv_sec; /* seconds */ |