Merge branch 'maint' of git://repo.or.cz/git-gui into maint

[git.git] / cache.h

diff --git a/cache.h b/cache.h
index 1ecaef14c329d8fed38734a73f0e89607b8ab7a3..98cfed63ee7f11ef647474057077fdb4e669a376 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -602,6 +602,7 @@ extern const char *git_log_output_encoding;
 /* IO helper functions */
 extern void maybe_flush_or_die(FILE *, const char *);
 extern int copy_fd(int ifd, int ofd);
+extern int copy_file(const char *dst, const char *src, int mode);
 extern int read_in_full(int fd, void *buf, size_t count);
 extern int write_in_full(int fd, const void *buf, size_t count);
 extern void write_or_die(int fd, const void *buf, size_t count);
@@ -614,8 +615,8 @@ extern const char *pager_program;
 extern int pager_in_use(void);
 extern int pager_use_color;
 
-extern char *editor_program;
-extern char *excludes_file;
+extern const char *editor_program;
+extern const char *excludes_file;
 
 /* base85 */
 int decode_85(char *dst, const char *line, int linelen);