Merge branch 'jc/am-i-v-fix'

[thirdparty/git.git] / cache.h

diff --git a/cache.h b/cache.h
index 26640b421d938a215236935d35c2d6b4f37fee6d..83b688cca6902f81f920f92fcaff0b27c70c075e 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -229,7 +229,9 @@ struct cache_entry {
 #error "CE_EXTENDED_FLAGS out of range"
 #endif
 
+/* Forward structure decls */
 struct pathspec;
+struct child_process;
 
 /*
  * Copy the sha1 and stat state of a cache entry from one to
@@ -1685,6 +1687,7 @@ extern int pager_use_color;
 extern int term_columns(void);
 extern int decimal_width(uintmax_t);
 extern int check_pager_config(const char *cmd);
+extern void prepare_pager_args(struct child_process *, const char *pager);
 
 extern const char *editor_program;
 extern const char *askpass_program;