aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2024-10-04 14:21:41 -0700
committerJunio C Hamano <gitster@pobox.com>2024-10-04 14:21:41 -0700
commitd30c2c4c53324f316f2392714a75a8f817121af7 (patch)
tree0d5013613d7ca11fb631e774c94806ea9605587e
parentMerge branch 'rs/archive-with-attr-pathspec-fix' (diff)
parentutf8.h: squelch unused-parameter warnings with NO_ICONV (diff)
downloadgit-d30c2c4c53324f316f2392714a75a8f817121af7.tar.gz
git-d30c2c4c53324f316f2392714a75a8f817121af7.zip
Merge branch 'mh/w-unused-fix'
Buildfix. * mh/w-unused-fix: utf8.h: squelch unused-parameter warnings with NO_ICONV
Diffstat (limited to '')
-rw-r--r--utf8.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/utf8.h b/utf8.h
index 35df76086a..cf8ecb0f21 100644
--- a/utf8.h
+++ b/utf8.h
@@ -33,8 +33,9 @@ char *reencode_string_len(const char *in, size_t insz,
const char *in_encoding,
size_t *outsz);
#else
-static inline char *reencode_string_len(const char *a, size_t b,
- const char *c, const char *d, size_t *e)
+static inline char *reencode_string_len(const char *a UNUSED, size_t b UNUSED,
+ const char *c UNUSED,
+ const char *d UNUSED, size_t *e)
{ if (e) *e = 0; return NULL; }
#endif