Andrew's git / gitweb.git / diff
?
msvc: do not re-declare the timespec struct
authorJeff Hostetler <jeffhost@microsoft.com>
Wed, 19 Jun 2019 21:06:03 +0000 (14:06 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 20 Jun 2019 21:03:05 +0000 (14:03 -0700)
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>
compat/mingw.h patch | blob | history
diff --git a/compat/mingw.h b/compat/mingw.h
index 210f1b01a892a9512f073712451a953415c3de81..a03e40e6e2a6cba13ed1fed2d4d690443fcd40a8 100644 (file)
--- 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;