diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-05-13 23:50:32 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-05-13 23:50:32 +0900 |
| commit | 4aeeef377347934d6f459e27f7d793de4ce384bb (patch) | |
| tree | a8031c9623eac896bf474ba2158e39afc6abb5b3 /resolve-undo.h | |
| parent | 2bfb182bc544214b3a15058b52b3a00c9811e3c2 (diff) | |
| parent | ad6dad0996f9226b2c3a5a3c725bf2952e52d7e7 (diff) | |
| download | git-4aeeef377347934d6f459e27f7d793de4ce384bb.tar.xz | |
Merge branch 'dl/no-extern-in-func-decl'
Mechanically and systematically drop "extern" from function
declarlation.
* dl/no-extern-in-func-decl:
*.[ch]: manually align parameter lists
*.[ch]: remove extern from function declarations using sed
*.[ch]: remove extern from function declarations using spatch
Diffstat (limited to 'resolve-undo.h')
| -rw-r--r-- | resolve-undo.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/resolve-undo.h b/resolve-undo.h index fbe348efac..2b3f0f901e 100644 --- a/resolve-undo.h +++ b/resolve-undo.h @@ -8,12 +8,12 @@ struct resolve_undo_info { struct object_id oid[3]; }; -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(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 struct pathspec *); -extern void unmerge_marked_index(struct index_state *); +void record_resolve_undo(struct index_state *, struct cache_entry *); +void resolve_undo_write(struct strbuf *, struct string_list *); +struct string_list *resolve_undo_read(const char *, unsigned long); +void resolve_undo_clear_index(struct index_state *); +int unmerge_index_entry_at(struct index_state *, int); +void unmerge_index(struct index_state *, const struct pathspec *); +void unmerge_marked_index(struct index_state *); #endif |