summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-06-13 18:21:30 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-06-13 18:21:30 (GMT)
commit04d30ce622517faa0c6bc34ac5626586b447e350 (patch)
treee4da893cea652d1555a108fa8732473be0e2d595
parent448598b5089455b30737c08915b62597a2132bf7 (diff)
parentec47a33fd2c3b679c3d8cbd440752414adb56ce9 (diff)
downloadgit-04d30ce622517faa0c6bc34ac5626586b447e350.zip
git-04d30ce622517faa0c6bc34ac5626586b447e350.tar.gz
git-04d30ce622517faa0c6bc34ac5626586b447e350.tar.bz2
Merge branch 'js/maint-windows'
* js/maint-windows: Recent MinGW has a C99 implementation of snprintf functions mingw: use _commit to implement fsync
-rw-r--r--Makefile1
-rw-r--r--compat/mingw.h2
2 files changed, 1 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index ff96f16..5fa893c 100644
--- a/Makefile
+++ b/Makefile
@@ -1040,7 +1040,6 @@ ifneq (,$(findstring MINGW,$(uname_S)))
NO_STRTOUMAX = YesPlease
NO_MKDTEMP = YesPlease
NO_MKSTEMPS = YesPlease
- SNPRINTF_RETURNS_BOGUS = YesPlease
NO_SVN_TESTS = YesPlease
NO_PERL_MAKEMAKER = YesPlease
RUNTIME_PREFIX = YesPlease
diff --git a/compat/mingw.h b/compat/mingw.h
index 0e3e743..f465566 100644
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@ -80,7 +80,7 @@ static inline int fork(void)
static inline unsigned int alarm(unsigned int seconds)
{ return 0; }
static inline int fsync(int fd)
-{ return 0; }
+{ return _commit(fd); }
static inline int getppid(void)
{ return 1; }
static inline void sync(void)