Be consistent and hold mutex in any case when returning from condition_t::timedwait().

[loba.git] / simgrid_features.h

diff --git a/simgrid_features.h b/simgrid_features.h
index 2f32a9b30ce95e5c9834e94c448dabc33cf5db26..00ff3a7b70bb2fcfed628b9d7aa1ae0e01f39946 100644 (file)
--- a/simgrid_features.h
+++ b/simgrid_features.h
@@ -3,13 +3,19 @@
 
 #include <simgrid_config.h>
 
 
 #include <simgrid_config.h>
 

-#if !defined(SIMGRID_VERSION) // ==================== SimGrid <= 3.5 === //
-#  error "Unsupported SimGrid version.  Need version > 3.5"
-#endif // ============================================================== //
+#if !defined(SIMGRID_VERSION) || SIMGRID_VERSION < 30700UL // == SG < 3.7 == //
+#  error "Unsupported SimGrid version.  Need version >= 3.7"
+#endif // ================================================================== //

 
 

-#if SIMGRID_VERSION < MAKE_SIMGRID_VERSION(3, 8, 0) // ==== SG < 3.8 === //
+#if SIMGRID_VERSION < 30800UL // ============================== SG < 3.8 === //

 #  define MSG_init(argc, argv) MSG_global_init(argc, argv)
 #  define MSG_init(argc, argv) MSG_global_init(argc, argv)

-#endif // ============================================================== //
+#  define msg_error_t   MSG_error_t
+#  define msg_host_t    m_host_t
+#  define msg_process_t m_process_t
+#  define msg_task_t    m_task_t
+#else // =================================================================== //
+#  define MSG_clean()   MSG_OK
+#endif // ================================================================== //

 
 #endif // !SIMGRID_FEATURES_H
 
 
 #endif // !SIMGRID_FEATURES_H