Fix build with MSG_USE_DEPRECATED.

[simgrid.git] / src / msg / msg_mailbox.c

diff --git a/src/msg/msg_mailbox.c b/src/msg/msg_mailbox.c
index f2eb97f9350e7ec37ddd6e2c87aeefe66cc720e0..6082642267cd26495056150c16301d2449f0ec81 100644 (file)
--- a/src/msg/msg_mailbox.c
+++ b/src/msg/msg_mailbox.c
@@ -1,6 +1,6 @@
 /* Mailboxes in MSG */
 
-/* Copyright (c) 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2008-2013. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -240,7 +240,8 @@ MSG_mailbox_put_with_timeout(msg_mailbox_t mailbox, msg_task_t task,
 
   /* Try to send it by calling SIMIX network layer */
   TRY {
-      smx_action_t comm = simcall_comm_isend(mailbox, t_simdata->message_size,
+    smx_action_t comm = NULL; /* MC needs the comm to be set to NULL during the simix call  */
+    comm = simcall_comm_isend(mailbox, t_simdata->message_size,
                                   t_simdata->rate, task, sizeof(void *),
                                   NULL, NULL, task, 0);
 #ifdef HAVE_TRACING
@@ -291,6 +292,6 @@ msg_mailbox_t MSG_mailbox_get_by_channel(msg_host_t host,
               && (channel < msg_global->max_channel), "Invalid channel %d",
               channel);
 
-  return host->mailboxes[(size_t) channel];
+  return MSG_host_priv(host)->mailboxes[(size_t) channel];
 }
 #endif