Add a platform with a bypass route. Add the test to cmake.

[simgrid.git] / src / simix / smx_user.c

diff --git a/src/simix/smx_user.c b/src/simix/smx_user.c
index fb75607..4184a76 100644 (file)
--- a/src/simix/smx_user.c
+++ b/src/simix/smx_user.c
@@ -4,10 +4,16 @@
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
-#define _SVID_SOURCE    /* strdup */
-#define _ISO_C99_SOURCE /* isfinite() */
-#define _ISOC99_SOURCE  /* isfinite() */
-#include <math.h>       /* isfinite() */
+#ifndef _SVID_SOURCE
+#  define _SVID_SOURCE    /* strdup() */
+#endif
+#ifndef _ISOC99_SOURCE
+#  define _ISOC99_SOURCE  /* isfinite() */
+#endif
+#ifndef _ISO_C99_SOURCE
+#  define _ISO_C99_SOURCE /* isfinite() */
+#endif
+#include <math.h>         /* isfinite() */
 
 #include "private.h"
 #include "mc/mc.h"
@@ -801,8 +807,7 @@ void SIMIX_req_comm_destroy(smx_action_t comm)
 {
   xbt_assert(comm, "Invalid parameter");
 
-  /* FIXME remove this request type: comms are auto-destroyed now,
-   * but what happens with unfinished comms? */
+  /* FIXME remove this request type: comms are auto-destroyed now */
 
   /*
   smx_req_t req = SIMIX_req_mine();
@@ -838,7 +843,7 @@ unsigned int SIMIX_req_comm_waitany(xbt_dynar_t comms)
 int SIMIX_req_comm_testany(xbt_dynar_t comms)
 {
   smx_req_t req = SIMIX_req_mine();
-  if (xbt_dynar_length(comms)==0)
+  if (xbt_dynar_is_empty(comms))
     return -1;
 
   req->call = REQ_COMM_TESTANY;