Merge git://git2.kernel.org/pub/scm/gitk/gitk into maint

[git.git] / cache.h

diff --git a/cache.h b/cache.h
index 384b260227dfb2fa30ecc175681b9b8d73a3577a..7cedda684f81e5b7bc111c2322ef1f4b2fc97d90 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -213,7 +213,7 @@ struct lock_file {
 extern int hold_lock_file_for_update(struct lock_file *, const char *path, int);
 extern int commit_lock_file(struct lock_file *);
 extern void rollback_lock_file(struct lock_file *);
-extern int delete_ref(const char *, unsigned char *sha1);
+extern int delete_ref(const char *, const unsigned char *sha1);
 
 /* Environment bits from configuration mechanism */
 extern int use_legacy_headers;
@@ -468,8 +468,8 @@ extern int pager_in_use;
 extern int pager_use_color;
 
 /* base85 */
-int decode_85(char *dst, char *line, int linelen);
-void encode_85(char *buf, unsigned char *data, int bytes);
+int decode_85(char *dst, const char *line, int linelen);
+void encode_85(char *buf, const unsigned char *data, int bytes);
 
 /* alloc.c */
 struct blob;