diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2009-05-31 18:15:15 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-01 00:07:21 -0700 |
| commit | f90cf2b9203e81e3a2b70b15480628e9189b7e60 (patch) | |
| tree | 0c9a33a98851847fe4fe2a04a87cdf4c0c082b8b | |
| parent | f9275c68af58e0f65e1557b5109ccbfdbbbc384a (diff) | |
| download | git-f90cf2b9203e81e3a2b70b15480628e9189b7e60.tar.gz git-f90cf2b9203e81e3a2b70b15480628e9189b7e60.tar.xz | |
MinGW: GCC >= 4 does not need SNPRINTF_SIZE_CORR anymore
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Steffen Prohaska <prohaska@zib.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | compat/snprintf.c | 4 |
2 files changed, 4 insertions, 1 deletions
@@ -847,7 +847,6 @@ ifneq (,$(findstring MINGW,$(uname_S))) UNRELIABLE_FSTAT = UnfortunatelyYes OBJECT_CREATION_USES_RENAMES = UnfortunatelyNeedsTo COMPAT_CFLAGS += -D__USE_MINGW_ACCESS -DNOGDI -Icompat -Icompat/regex -Icompat/fnmatch - COMPAT_CFLAGS += -DSNPRINTF_SIZE_CORR=1 COMPAT_CFLAGS += -DSTRIP_EXTENSION=\".exe\" COMPAT_OBJS += compat/mingw.o compat/fnmatch/fnmatch.o compat/regex/regex.o compat/winansi.o EXTLIBS += -lws2_32 diff --git a/compat/snprintf.c b/compat/snprintf.c index 357e73307..6c0fb056a 100644 --- a/compat/snprintf.c +++ b/compat/snprintf.c @@ -6,8 +6,12 @@ * number of characters to write without the trailing NUL. */ #ifndef SNPRINTF_SIZE_CORR +#if defined(__MINGW32__) && defined(__GNUC__) && __GNUC__ < 4 +#define SNPRINTF_SIZE_CORR 1 +#else #define SNPRINTF_SIZE_CORR 0 #endif +#endif #undef vsnprintf int git_vsnprintf(char *str, size_t maxsize, const char *format, va_list ap) |