Merge branch 'ab/merge-file-prefix'

diff --git a/cache.h b/cache.h
index f704af5df0984e092fe318e535596921c4ea7122..04951ddcbf7cf2cb61957568f8608b0fbbd9c9da 100644 (file)
--- 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;