Merge branch 'nd/checkout-noisy-unmerge'

diff --git a/sub-process.c b/sub-process.c
index 80571567f2a64be451fe2ac92c230f66fa04c844..8d2a1707cfe1a7d0fb6b589f0857a6389a8a3d70 100644 (file)
--- a/sub-process.c
+++ b/sub-process.c
@@ -6,10 +6,13 @@
 #include "pkt-line.h"
 
 int cmd2process_cmp(const void *unused_cmp_data,
-                   const struct subprocess_entry *e1,
-                   const struct subprocess_entry *e2,
+                   const void *entry,
+                   const void *entry_or_key,
                    const void *unused_keydata)
 {
+       const struct subprocess_entry *e1 = entry;
+       const struct subprocess_entry *e2 = entry_or_key;
+
        return strcmp(e1->cmd, e2->cmd);
 }