diff options
| author |  Jeff Hostetler <jeffhost@microsoft.com> | 2019-06-19 14:06:03 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-06-20 14:03:05 -0700 |
| commit | 172e54e2d7cd1207e2be4ad023d0337858a91d56 (patch) | |
| tree | 35d4ce628a7a6c323133fb19de7d4890c2901ac9 | |
| parent | msvc: mark a variable as non-const (diff) | |
| download | tgif-172e54e2d7cd1207e2be4ad023d0337858a91d56.tar.xz | |
msvc: do not re-declare the timespec struct
VS2015's headers already declare that struct.
Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | compat/mingw.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/compat/mingw.h b/compat/mingw.h index 210f1b01a8..a03e40e6e2 100644 --- a/compat/mingw.h +++ b/compat/mingw.h @@ -352,11 +352,13 @@ static inline int getrlimit(int resource, struct rlimit *rlp) #ifndef __MINGW64_VERSION_MAJOR #define off_t off64_t #define lseek _lseeki64 +#ifndef _MSC_VER struct timespec { time_t tv_sec; long tv_nsec; }; #endif +#endif struct mingw_stat { _dev_t st_dev; |