Merge branch 'rs/obsd-getcwd-workaround' into next

diff --git a/diffcore-delta.c b/diffcore-delta.c
index e2db85abd9f04d5e3a7a71ad396921cf9f2908b6..ebe70fb068519be86437a11b980d804be0534c75 100644 (file)
--- a/diffcore-delta.c
+++ b/diffcore-delta.c
@@ -158,10 +158,7 @@ static struct spanhash_top *hash_chars(struct diff_filespec *one)
                n = 0;
                accum1 = accum2 = 0;
        }
-       qsort(hash->data,
-               1ul << hash->alloc_log2,
-               sizeof(hash->data[0]),
-               spanhash_cmp);
+       QSORT(hash->data, 1ul << hash->alloc_log2, spanhash_cmp);
        return hash;
 }