From: Jeff Hostetler <jeffhost@microsoft.com>
Date: Wed, 19 Jun 2019 21:06:03 +0000 (-0700)
Subject: msvc: do not re-declare the timespec struct
X-Git-Tag: v2.23.0-rc0~58^2~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=172e54e2d7cd1207e2be4ad023d0337858a91d56;p=thirdparty%2Fgit.git

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>
---

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;