From: Junio C Hamano Date: Wed, 06 Sep 2017 03:35:24 GMT Subject: Re: [PATCH 3/3] merge-recursive: change current file dir string_lists to hashmap Message-ID: In-Reply-To: <20170828202829.3056-4-kewillf@microsoft.com> I needed this squashed into before I could even compile the resulting code. Perhaps my compiler is stale? merge-recursive.c:28:22: error: declaration does not declare anything [-Werror] struct hashmap_entry; ^ merge-recursive.c:29:7: error: flexible array member in otherwise empty struct char path[FLEX_ARRAY]; ^ --- merge-recursive.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/merge-recursive.c b/merge-recursive.c index ef4fe5f09f..1cd35db3f0 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -25,7 +25,7 @@ #include "submodule.h" struct path_hashmap_entry { - struct hashmap_entry; + struct hashmap_entry e; char path[FLEX_ARRAY]; }; -- 2.14.1-546-g97ae4c876d