X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/b78d5563826957045678f4c3bcfdcef6c9bfc48d..faf4f25d61d1bf77d5a2a4a21839a090612e46df:/simgrid_features.h

diff --git a/simgrid_features.h b/simgrid_features.h
index 8aef329..75a1521 100644
--- a/simgrid_features.h
+++ b/simgrid_features.h
@@ -1,15 +1,33 @@
 #ifndef SIMGRID_FEATURES_H
 #define SIMGRID_FEATURES_H
 
-// Try to guess if MSG_wait destroys communications or not, because it
-// changed after SimGrid 3.5.
-//
-// Use some define introduced after that.               fixme: dirty hack
-//
-#if defined(XBT_RUNNING_CTX_INITIALIZER)
-#  define MSG_WAIT_DESTROYS_COMMS 0
-#else
-#  define MSG_WAIT_DESTROYS_COMMS 1
-#endif
+/* What is defined here:
+ * =====================
+ *
+ * MSG_WAIT_DESTROYS_COMMS      1 if MSG_wait destroys communications
+ *                              (has changed after SimGrid 3.5)
+ *
+ * MSG_comm_get_status(comm)    MSG_OK on SG 3.5 where it does not exist.
+ */
+
+#if !defined(SIMGRID_VERSION) // ========== SimGrid <= 3.5 ============= //
+
+#define MSG_WAIT_DESTROYS_COMMS 1
+
+inline
+MSG_error_t MSG_comm_get_status(msg_comm_t /*comm*/)
+{
+    return MSG_OK;
+}
+
+#else  // ================================= SimGrid > 3.5 ============== //
+
+#define MSG_WAIT_DESTROYS_COMMS 0
+
+#endif  // ============================================================= //
 
 #endif // !SIMGRID_FEATURES_H
+
+// Local variables:
+// mode: c++
+// End: