From 669819cc2941fc50b392676c61c4d54864502e45 Mon Sep 17 00:00:00 2001 From: Augustin Degomme Date: Thu, 14 Nov 2013 19:00:54 +0100 Subject: [PATCH] these terrible sort operators were working everywhere except on bsd, where qsort is stricter --- src/smpi/smpi_base.c | 3 ++- src/surf/network.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/smpi/smpi_base.c b/src/smpi/smpi_base.c index 8002b02ac6..952db704fa 100644 --- a/src/smpi/smpi_base.c +++ b/src/smpi/smpi_base.c @@ -77,7 +77,8 @@ xbt_dynar_t smpi_ois_values = NULL; static int factor_cmp(const void *pa, const void *pb) { - return (((s_smpi_factor_t*)pa)->factor > ((s_smpi_factor_t*)pb)->factor); + return (((s_smpi_factor_t*)pa)->factor > ((s_smpi_factor_t*)pb)->factor) ? 1 : + (((s_smpi_factor_t*)pa)->factor < ((s_smpi_factor_t*)pb)->factor) ? -1 : 0; } diff --git a/src/surf/network.c b/src/surf/network.c index d521acfb60..21a86ea04b 100644 --- a/src/surf/network.c +++ b/src/surf/network.c @@ -81,7 +81,8 @@ static double constant_bandwidth_constraint(double rate, double bound, static int factor_cmp(const void *pa, const void *pb) { - return (((s_smpi_factor_t*)pa)->factor > ((s_smpi_factor_t*)pb)->factor); + return (((s_smpi_factor_t*)pa)->factor > ((s_smpi_factor_t*)pb)->factor) ? 1 : + (((s_smpi_factor_t*)pa)->factor < ((s_smpi_factor_t*)pb)->factor) ? -1 : 0; } -- 2.20.1