aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Schuberth <sschuberth@gmail.com>2013-09-11 18:02:09 +0200
committerJunio C Hamano <gitster@pobox.com>2013-09-11 11:11:06 -0700
commitfa93bb20d72edf9f7635c63d46101edb206d3d6f (patch)
treebb22398e467bccb494ac56ed22fecda06f5e8f35
parenta2374f58e86777258c11ed2d7855a28cd4219648 (diff)
downloadgit-fa93bb20d72edf9f7635c63d46101edb206d3d6f.tar.gz
git-fa93bb20d72edf9f7635c63d46101edb206d3d6f.tar.xz
MinGW: Fix stat definitions to work with MinGW runtime version 4.0
For an overview of changes in mingwrt-4.0 see: http://sourceforge.net/p/mingw/mingw-org-wsl/ci/4.0.0/tree/NEWS Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--compat/mingw.c1
-rw-r--r--compat/mingw.h9
-rw-r--r--config.mak.uname2
3 files changed, 10 insertions, 2 deletions
diff --git a/compat/mingw.c b/compat/mingw.c
index 22ee9ef1c..fecb98bcf 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -491,7 +491,6 @@ int mingw_stat(const char *file_name, struct stat *buf)
return do_stat_internal(1, file_name, buf);
}
-#undef fstat
int mingw_fstat(int fd, struct stat *buf)
{
HANDLE fh = (HANDLE)_get_osfhandle(fd);
diff --git a/compat/mingw.h b/compat/mingw.h
index 3c3a9d925..19d82de41 100644
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@ -271,11 +271,20 @@ static inline int getrlimit(int resource, struct rlimit *rlp)
#define lseek _lseeki64
/* use struct stat with 64 bit st_size */
+#ifdef stat
+#undef stat
+#endif
#define stat _stati64
int mingw_lstat(const char *file_name, struct stat *buf);
int mingw_stat(const char *file_name, struct stat *buf);
int mingw_fstat(int fd, struct stat *buf);
+#ifdef fstat
+#undef fstat
+#endif
#define fstat mingw_fstat
+#ifdef lstat
+#undef lstat
+#endif
#define lstat mingw_lstat
#ifndef _stati64
diff --git a/config.mak.uname b/config.mak.uname
index 781dee4db..82d549e48 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -500,7 +500,7 @@ ifneq (,$(findstring MINGW,$(uname_S)))
NO_INET_NTOP = YesPlease
NO_POSIX_GOODIES = UnfortunatelyYes
DEFAULT_HELP_FORMAT = html
- COMPAT_CFLAGS += -D__USE_MINGW_ACCESS -DNOGDI -Icompat -Icompat/win32
+ COMPAT_CFLAGS += -D__USE_MINGW_ACCESS -D_USE_32BIT_TIME_T -DNOGDI -Icompat -Icompat/win32
COMPAT_CFLAGS += -DSTRIP_EXTENSION=\".exe\"
COMPAT_OBJS += compat/mingw.o compat/winansi.o \
compat/win32/pthread.o compat/win32/syslog.o \