From b8bba419250711a69e09e7648e5c991f4847a127 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 1 Feb 2010 22:04:03 -0800 Subject: 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 --- resolve-undo.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'resolve-undo.h') 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 **); -- cgit v1.2.3