summaryrefslogtreecommitdiff
path: root/resolve-undo.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-02-01 22:04:03 -0800
committerJunio C Hamano <gitster@pobox.com>2010-02-01 22:04:03 -0800
commitb8bba419250711a69e09e7648e5c991f4847a127 (patch)
treefbf3e2a7c4f36d21ec68d3eed85a13ac6e0d474b /resolve-undo.h
parent562d53fa69933b3ade2691b99cbe67722313f43c (diff)
downloadgit-b8bba419250711a69e09e7648e5c991f4847a127.tar.gz
build: make code "-Wpointer-arith" clean
Recently introduced resolve_undo_read() expected arithmetic to (void *) to work on byte-addresses. Correct this. Noticed by Brandon Casey. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'resolve-undo.h')
-rw-r--r--resolve-undo.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/resolve-undo.h b/resolve-undo.h
index e4e5c1b1ad..845876911d 100644
--- a/resolve-undo.h
+++ b/resolve-undo.h
@@ -8,7 +8,7 @@ struct resolve_undo_info {
extern void record_resolve_undo(struct index_state *, struct cache_entry *);
extern void resolve_undo_write(struct strbuf *, struct string_list *);
-extern struct string_list *resolve_undo_read(void *, unsigned long);
+extern struct string_list *resolve_undo_read(const char *, unsigned long);
extern void resolve_undo_clear_index(struct index_state *);
extern int unmerge_index_entry_at(struct index_state *, int);
extern void unmerge_index(struct index_state *, const char **);