From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 24 Jun 2015 19:21:46 +0000 (-0700)
Subject: Merge branch 'es/utf8-stupid-compiler-workaround'
X-Git-Tag: v2.5.0-rc0~20
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/5d24b109a64827708cbe98b865aba5d51a2f7c3b?hp=4b64c8a1eea6b44fb8505ec46cccf8255c7e6c63

Merge branch 'es/utf8-stupid-compiler-workaround'

A compilation workaround.

* es/utf8-stupid-compiler-workaround:
utf8: NO_ICONV: silence uninitialized variable warning
---

diff --git a/utf8.h b/utf8.h
index e7b2aa4168..5a9e94bee6 100644
--- a/utf8.h
+++ b/utf8.h
@@ -31,7 +31,9 @@ char *reencode_string_len(const char *in, int insz,
 			  const char *in_encoding,
 			  int *outsz);
 #else
-#define reencode_string_len(a,b,c,d,e) NULL
+static inline char *reencode_string_len(const char *a, int b,
+					const char *c, const char *d, int *e)
+{ if (e) *e = 0; return NULL; }
 #endif
 
 static inline char *reencode_string(const char *in,