From ef3ca95475ce467ae883cc8175ed40e6f7d27800 Mon Sep 17 00:00:00 2001 From: Elijah Newren Date: Wed, 15 Aug 2018 10:54:05 -0700 Subject: Add missing includes and forward declarations I looped over the toplevel header files, creating a temporary two-line C program for each consisting of #include "git-compat-util.h" #include $HEADER This patch is the result of manually fixing errors in compiling those tiny programs. Signed-off-by: Elijah Newren Signed-off-by: Junio C Hamano --- merge-recursive.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'merge-recursive.h') diff --git a/merge-recursive.h b/merge-recursive.h index fa7bc6b683..0c46a5a4ff 100644 --- a/merge-recursive.h +++ b/merge-recursive.h @@ -1,8 +1,10 @@ #ifndef MERGE_RECURSIVE_H #define MERGE_RECURSIVE_H -#include "unpack-trees.h" #include "string-list.h" +#include "unpack-trees.h" + +struct commit; struct merge_options { const char *ancestor; -- cgit v1.2.3