Merge branch 'jk/ambiguous-short-object-names'

diff --git a/sha1-array.c b/sha1-array.c
index af1d7d560d303f6a04ff1029909782c7969a655c..c1cc25cd95da66aec1c695f4bba9680f5cb834f6 100644 (file)
--- a/sha1-array.c
+++ b/sha1-array.c
@@ -16,7 +16,7 @@ static int void_hashcmp(const void *a, const void *b)
 
 static void sha1_array_sort(struct sha1_array *array)
 {
-       qsort(array->sha1, array->nr, sizeof(*array->sha1), void_hashcmp);
+       QSORT(array->sha1, array->nr, void_hashcmp);
        array->sorted = 1;
 }