summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-06-24 19:21:46 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-06-24 19:21:46 (GMT)
commit5d24b109a64827708cbe98b865aba5d51a2f7c3b (patch)
tree6510f7803aa83be75e33764a34475032b3645660
parent4b64c8a1eea6b44fb8505ec46cccf8255c7e6c63 (diff)
parente654eb29ab9da97f6acabc261f88aa1f41f78a8f (diff)
downloadgit-5d24b109a64827708cbe98b865aba5d51a2f7c3b.zip
git-5d24b109a64827708cbe98b865aba5d51a2f7c3b.tar.gz
git-5d24b109a64827708cbe98b865aba5d51a2f7c3b.tar.bz2
Merge branch 'es/utf8-stupid-compiler-workaround'
A compilation workaround. * es/utf8-stupid-compiler-workaround: utf8: NO_ICONV: silence uninitialized variable warning
-rw-r--r--utf8.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/utf8.h b/utf8.h
index e7b2aa4..5a9e94b 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,