OLD | NEW |
(Empty) | |
| 1 diff -Naurb src2/main.c src/main.c |
| 2 --- src2/main.c 2016-08-15 20:29:35.487496988 -0700 |
| 3 +++ src/main.c 2016-08-15 20:27:50.297937988 -0700 |
| 4 @@ -1034,7 +1034,8 @@ |
| 5 } |
| 6 } |
| 7 |
| 8 -int compare_parse(Linkage_info * p1, Linkage_info * p2) { |
| 9 +int compare_parse(const void* a, const void* b) { |
| 10 + const Linkage_info *p1 = (Linkage_info*) a, *p2 = (Linkage_info*) b; |
| 11 /* for sorting the linkages */ |
| 12 if (p1->N_violations != p2->N_violations) { |
| 13 return (p1->N_violations - p2->N_violations); |
| 14 @@ -1420,8 +1421,7 @@ |
| 15 N_canonical_linkages ++; |
| 16 } |
| 17 qsort((void *)linkage, N_canonical_linkages, |
| 18 - sizeof(Linkage_info), |
| 19 - (int (*)(const void *, const void *))compare_parse); |
| 20 + sizeof(Linkage_info), compare_parse); |
| 21 } |
| 22 |
| 23 assert(! ((N_canonical_linkages == 0) && (N_linkages > 0) && (N_linkages < l
inkage_count_limit)), |
| 24 @@ -1622,8 +1622,7 @@ |
| 25 N_canonical_linkages ++; |
| 26 } |
| 27 qsort((void *)linkage, N_canonical_linkages, |
| 28 - sizeof(Linkage_info), |
| 29 - (int (*)(const void *, const void *))compare_parse); |
| 30 + sizeof(Linkage_info), compare_parse); |
| 31 } |
| 32 |
| 33 print_time("Postprocessed some linkages"); |
| 34 diff -Naurb src2/post-process.c src/post-process.c |
| 35 --- src2/post-process.c 2016-08-15 20:29:35.483496929 -0700 |
| 36 +++ src/post-process.c 2016-08-15 20:27:59.902080352 -0700 |
| 37 @@ -379,7 +379,8 @@ |
| 38 } |
| 39 } |
| 40 |
| 41 -int domain_compare(Domain * d1, Domain * d2) { |
| 42 +int domain_compare(const void *a, const void *b) { |
| 43 + const Domain *d1 = (Domain*) a, *d2 = (Domain*) b; |
| 44 /* for sorting the domains by size */ |
| 45 return (d1->size - d2->size) ; |
| 46 } |
| 47 @@ -434,8 +435,7 @@ |
| 48 N_domains++; |
| 49 } |
| 50 } |
| 51 - qsort((void *)domain_array, N_domains, sizeof(Domain), |
| 52 - (int (*)(const void *, const void *))domain_compare); |
| 53 + qsort((void *)domain_array, N_domains, sizeof(Domain), domain_compare); |
| 54 /* sort the domains by size */ |
| 55 |
| 56 for (d=0; d<N_domains; d++) { |
| 57 diff -Naurb src2/strncasecmp.c src/strncasecmp.c |
| 58 --- src2/strncasecmp.c 2016-08-15 20:29:35.487496988 -0700 |
| 59 +++ src/strncasecmp.c 2016-08-15 15:29:09.408238838 -0700 |
| 60 @@ -15,6 +15,7 @@ |
| 61 } |
| 62 #endif |
| 63 |
| 64 +#ifndef __EMSCRIPTEN__ |
| 65 int strncasecmp(const char *s1, const char *s2, size_t n) |
| 66 { |
| 67 |
| 68 @@ -35,5 +36,6 @@ |
| 69 if (*j) return 1; |
| 70 return 0; |
| 71 } |
| 72 +#endif |
| 73 |
| 74 |
OLD | NEW |