Merge branch 'ax/line-log-range-merge-fix' into maint

diff --git a/line-log.c b/line-log.c
index 47eaba73c68905a12037365f8a3d3118a3ea3ddd..9510296659a39475008aaa41c0a42196dc8d8d6d 100644 (file)
--- a/line-log.c
+++ b/line-log.c
@@ -113,7 +113,7 @@ void sort_and_merge_range_set(struct range_set *rs)
        int i;
        int o = 0; /* output cursor */
 
-       qsort(rs->ranges, rs->nr, sizeof(struct range), range_cmp);
+       QSORT(rs->ranges, rs->nr, range_cmp);
 
        for (i = 0; i < rs->nr; i++) {
                if (rs->ranges[i].start == rs->ranges[i].end)