diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-06-13 11:21:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-13 11:21:30 -0700 |
| commit | 04d30ce622517faa0c6bc34ac5626586b447e350 (patch) | |
| tree | e4da893cea652d1555a108fa8732473be0e2d595 | |
| parent | Merge branch 'bw/diff-metainfo-color' (diff) | |
| parent | Recent MinGW has a C99 implementation of snprintf functions (diff) | |
| download | tgif-04d30ce622517faa0c6bc34ac5626586b447e350.tar.xz | |
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-- | Makefile | 1 | ||||
| -rw-r--r-- | compat/mingw.h | 2 |
2 files changed, 1 insertions, 2 deletions
@@ -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 0e3e743041..f465566b7a 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) |