aboutsummaryrefslogtreecommitdiff
path: root/sub-process.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-07-13 16:14:54 -0700
committerJunio C Hamano <gitster@pobox.com>2017-07-13 16:14:54 -0700
commit91f69225443b3be8d3f11c5c71795169d7d00737 (patch)
tree7c891653d8fb17dfb29641cc8e56385064816e94 /sub-process.h
parenteac97b438c6734304c155604f4c36ac63f29ca6f (diff)
parent1ecbf31d0298a1ed952623108e23234d5cf37086 (diff)
downloadgit-91f69225443b3be8d3f11c5c71795169d7d00737.tar.gz
git-91f69225443b3be8d3f11c5c71795169d7d00737.tar.xz
Merge branch 'sb/hashmap-customize-comparison'
Update the hashmap API so that data to customize the behaviour of the comparison function can be specified at the time a hashmap is initialized. * sb/hashmap-customize-comparison: hashmap: migrate documentation from Documentation/technical into header patch-ids.c: use hashmap correctly hashmap.h: compare function has access to a data field
Diffstat (limited to 'sub-process.h')
-rw-r--r--sub-process.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/sub-process.h b/sub-process.h
index d9a45cd35..96a2cca36 100644
--- a/sub-process.h
+++ b/sub-process.h
@@ -20,8 +20,10 @@ struct subprocess_entry {
/* subprocess functions */
-int cmd2process_cmp(const struct subprocess_entry *e1,
- const struct subprocess_entry *e2, const void *unused);
+extern int cmd2process_cmp(const void *unused_cmp_data,
+ const struct subprocess_entry *e1,
+ const struct subprocess_entry *e2,
+ const void *unused_keydata);
typedef int(*subprocess_start_fn)(struct subprocess_entry *entry);
int subprocess_start(struct hashmap *hashmap, struct subprocess_entry *entry, const char *cmd,