From: Shawn O. Pearce Date: Sun, 21 Oct 2007 04:51:09 +0000 (-0400) Subject: Use PRIuMAX instead of 'unsigned long long' in show-index X-Git-Tag: v1.5.4-rc0~330 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5be507fc955bd14643cac1162cfaa592d0e236ba;p=git.git Use PRIuMAX instead of 'unsigned long long' in show-index Elsewhere in Git we already use PRIuMAX and cast to uintmax_t when we need to display a value that is 'very big' and we're not exactly sure what the largest display size is for this platform. This particular fix is needed so we can do the incredibly crazy temporary hack of: diff --git a/cache.h b/cache.h index e0abcd6..6637fd8 100644 --- a/cache.h +++ b/cache.h @@ -6,6 +6,7 @@ #include SHA1_HEADER #include +#define long long long #if ZLIB_VERNUM < 0x1200 #define deflateBound(c,s) ((s) + (((s) + 7) >> 3) + (((s) + 63) >> 6) + 11) allowing us to more easily look for locations where we are passing a pointer to an 8 byte value to a function that expects a 4 byte value. This can occur on some platforms where sizeof(long) == 8 and sizeof(size_t) == 4. Signed-off-by: Shawn O. Pearce --- diff --git a/show-index.c b/show-index.c index 57ed9e87b..7253991ff 100644 --- 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)); }