submodule, repack: migrate to git-sh-setup's say()

diff --git a/utf8.c b/utf8.c
index ddfdc5e2b88d346886f64e39a93ced85cc10a78e..db706ac4ed6f033091cfaeb7b23c07ca7fd71675 100644 (file)
--- a/utf8.c
+++ b/utf8.c
@@ -354,7 +354,7 @@ int is_encoding_utf8(const char *name)
  * with iconv.  If the conversion fails, returns NULL.
  */
 #ifndef NO_ICONV
-#ifdef OLD_ICONV
+#if defined(OLD_ICONV) || (defined(__sun__) && !defined(_XPG6))
        typedef const char * iconv_ibp;
 #else
        typedef char * iconv_ibp;