#ifndef SIMGRID_FEATURES_H
#define SIMGRID_FEATURES_H
-// fixme: dirty hack
-#if defined(XBT_RUNNING_CTX_INITIALIZER)
+// 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(SIMGRID_VERSION)
# define MSG_WAIT_DESTROYS_COMMS 0
#else
# define MSG_WAIT_DESTROYS_COMMS 1