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://git.lorimer.id.au/gitweb.git/diff_plain/5d24b109a64827708cbe98b865aba5d51a2f7c3b?ds=inline;hp=-c

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

A compilation workaround.

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

5d24b109a64827708cbe98b865aba5d51a2f7c3b
diff --combined utf8.h
index e7b2aa4168,07e7054343..5a9e94bee6
--- a/utf8.h
+++ b/utf8.h
@@@ -13,9 -13,6 +13,9 @@@ int same_encoding(const char *, const c
  __attribute__((format (printf, 2, 3)))
  int utf8_fprintf(FILE *, const char *, ...);
  
 +extern const char utf8_bom[];
 +extern int skip_utf8_bom(char **, size_t);
 +
  void strbuf_add_wrapped_text(struct strbuf *buf,
  		const char *text, int indent, int indent2, int width);
  void strbuf_add_wrapped_bytes(struct strbuf *buf, const char *data, int len,
@@@ -31,7 -28,9 +31,9 @@@ char *reencode_string_len(const char *i
  			  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,