diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-06-24 12:21:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-24 12:21:46 -0700 |
| commit | 5d24b109a64827708cbe98b865aba5d51a2f7c3b (patch) | |
| tree | 6510f7803aa83be75e33764a34475032b3645660 | |
| parent | Merge branch 'rl/am-3way-config' (diff) | |
| parent | utf8: NO_ICONV: silence uninitialized variable warning (diff) | |
| download | tgif-5d24b109a64827708cbe98b865aba5d51a2f7c3b.tar.xz | |
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.h | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -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, |