these terrible sort operators were working everywhere except on bsd, where qsort...

(cherry picked from commit 669819cc2941fc50b392676c61c4d54864502e45)

diff --git a/src/smpi/smpi_base.c b/src/smpi/smpi_base.c
index 8002b02..952db70 100644 (file)
--- 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 d521acf..21a86ea 100644 (file)
--- 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;
 }