git-p4: Unset P4DIFF environment variable when using 'p4 -du diff'

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