c12e1bb Do not uglily deconst and fix build with gcc 4.2 — HardenedBSD-pkg

HardenedBSD Package Manager

Do not uglily deconst and fix build with gcc 4.2

Baptiste Daroussin committed 12 years ago

commit c12e1bb3aa2590ccaaf47d32b148ccda130a6f16
parent 515f57794cb40a4d8cd986b4e6db1a25e9bb9447

1 file changed +6 -6

modified libpkg/dns_utils.c

@@ -43,10 +43,10 @@ typedef union {

 static int
 srv_priority_cmp(const void *a, const void *b)
 {
 	struct dns_srvinfo *da, *db;
 	const struct dns_srvinfo *da, *db;
 	da = *(struct dns_srvinfo **)__DECONST(void *,a);
 	db = *(struct dns_srvinfo **)__DECONST(void *,b);
 	da = *(struct dns_srvinfo * const *)a;
 	db = *(struct dns_srvinfo * const *)b;
 	return ((da->priority > db->priority) - (da->priority < db->priority));
 }

@@ -54,11 +54,11 @@ srv_priority_cmp(const void *a, const void *b)

 static int
 srv_final_cmp(const void *a, const void *b)
 {
 	struct dns_srvinfo *da, *db;
 	const struct dns_srvinfo *da, *db;
 	int res;
 	da = *(struct dns_srvinfo **)__DECONST(void *,a);
 	db = *(struct dns_srvinfo **)__DECONST(void *,b);
 	da = *(struct dns_srvinfo * const *)a;
 	db = *(struct dns_srvinfo * const *)b;
 	res = ((da->priority > db->priority) - (da->priority < db->priority));
 	if (res == 0)