summaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-03-05 21:12:59 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-03-05 21:12:59 (GMT)
commit3bef3c12d6c0f5be0e95eb143fdd32583bae7a74 (patch)
treeb0e85bc4ca5747690f50e3aa1a62a07b3fc7e7c1 /cache.h
parentb1cffbfcfc78a0d9cd98ee983630b4473b2aab16 (diff)
parentd306f3d3513c62342fec4e31457766f2473f9e9a (diff)
downloadgit-3bef3c12d6c0f5be0e95eb143fdd32583bae7a74.zip
git-3bef3c12d6c0f5be0e95eb143fdd32583bae7a74.tar.gz
git-3bef3c12d6c0f5be0e95eb143fdd32583bae7a74.tar.bz2
Merge branch 'jk/decimal-width-for-uintmax' into maint
We didn't format an integer that wouldn't fit in "int" but in "uintmax_t" correctly. * jk/decimal-width-for-uintmax: decimal_width: avoid integer overflow
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/cache.h b/cache.h
index f704af5..04951dd 100644
--- a/cache.h
+++ b/cache.h
@@ -1498,7 +1498,7 @@ extern const char *pager_program;
extern int pager_in_use(void);
extern int pager_use_color;
extern int term_columns(void);
-extern int decimal_width(int);
+extern int decimal_width(uintmax_t);
extern int check_pager_config(const char *cmd);
extern const char *editor_program;