Merge branch 'maint-1.6.1' into maint

diff --git a/show-index.c b/show-index.c
index 57ed9e87b7fca6c899d4c23d709a97dabce28106..45bb535773fd9c36f73502df9462f7de800009c8 100644 (file)
--- a/show-index.c
+++ b/show-index.c
@@ -68,7 +68,8 @@ int main(int argc, char **argv)
                                                     ntohl(off64[1]);
                                off64_nr++;
                        }
-                       printf("%llu %s (%08x)\n", (unsigned long long) offset,
+                       printf("%" PRIuMAX " %s (%08"PRIx32")\n",
+                              (uintmax_t) offset,
                               sha1_to_hex(entries[i].sha1),
                               ntohl(entries[i].crc));
                }