]> git.ipfire.org Git - thirdparty/libarchive.git/commitdiff
Cast comparison functions to __compar_fn_t if stdlib.h defines it.
authorAndres Mejia <amejia004@gmail.com>
Thu, 7 Feb 2013 21:57:22 +0000 (16:57 -0500)
committerAndres Mejia <amejia004@gmail.com>
Thu, 7 Feb 2013 21:57:22 +0000 (16:57 -0500)
libarchive/archive_write_set_format_iso9660.c

index 7bdcd0199a0a2e4b76a15c7d7fd7b2fec854f18f..591370298d517890d76e9f7c885699c7804fe046 100644 (file)
@@ -6918,12 +6918,22 @@ isoent_make_path_table_2(struct archive_write *a, struct vdd *vdd,
        switch (vdd->vdd_type) {
        case VDD_PRIMARY:
        case VDD_ENHANCED:
+#ifdef __COMPAR_FN_T
+               qsort(enttbl, pt->cnt, sizeof(struct isoent *),
+                   (__compar_fn_t)_compare_path_table);
+#else
                qsort(enttbl, pt->cnt, sizeof(struct isoent *),
                    _compare_path_table);
+#endif
                break;
        case VDD_JOLIET:
+#ifdef __COMPAR_FN_T
+               qsort(enttbl, pt->cnt, sizeof(struct isoent *),
+                   (__compar_fn_t)_compare_path_table_joliet);
+#else
                qsort(enttbl, pt->cnt, sizeof(struct isoent *),
                    _compare_path_table_joliet);
+#endif
                break;
        }
        for (i = 0; i < pt->cnt; i++)