From: Junio C Hamano <gitster@pobox.com>
To: Kevin Willford <kewillf@microsoft.com>
Cc: git@vger.kernel.org, peff@peff.net
Subject: Re: [PATCH 3/3] merge-recursive: change current file dir string_lists to hashmap
Date: Wed, 06 Sep 2017 12:35:24 +0900 [thread overview]
Message-ID: <xmqq4lsg8poj.fsf@gitster.mtv.corp.google.com> (raw)
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
prev parent reply other threads:[~2017-09-06 3:35 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-28 20:28 [PATCH 0/3] merge-recursive: replace string_list with hashmap Kevin Willford
2017-08-28 20:28 ` [PATCH 1/3] merge-recursive: fix memory leak Kevin Willford
2017-08-28 22:42 ` Ben Peart
2017-08-29 8:12 ` Jeff King
2017-08-28 20:28 ` [PATCH 2/3] merge-recursive: remove return value from get_files_dirs Kevin Willford
2017-08-28 22:45 ` Ben Peart
2017-08-29 8:19 ` Jeff King
2017-08-29 8:17 ` Jeff King
2017-08-29 15:58 ` Kevin Willford
2017-08-29 16:50 ` Jeff King
2017-08-31 18:12 ` Stefan Beller
2017-08-28 20:28 ` [PATCH 3/3] merge-recursive: change current file dir string_lists to hashmap Kevin Willford
2017-08-28 23:06 ` Ben Peart
2017-08-29 8:41 ` Jeff King
2017-09-06 3:35 ` Junio C Hamano [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq4lsg8poj.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=kewillf@microsoft.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).