seriously, me

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

diff --git a/src/msg/msg_mailbox.h b/src/msg/msg_mailbox.h
index f587002..8a7953c 100644 (file)
--- a/src/msg/msg_mailbox.h
+++ b/src/msg/msg_mailbox.h
@@ -1,15 +1,16 @@
-/* Copyright (c) 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2008-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* 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. */
+ * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #ifndef MSG_MAILBOX_H
 #define MSG_MAILBOX_H
 
+#include <xbt/base.h>
 #include "xbt/fifo.h"
 #include "simgrid/simix.h"
-#include "msg/datatypes.h"
+#include "simgrid/msg.h"
 
 
 SG_BEGIN_DECL()
@@ -27,7 +28,7 @@ SG_BEGIN_DECL()
 XBT_PUBLIC(msg_mailbox_t)
     MSG_mailbox_new(const char *alias);
 
-void MSG_mailbox_free(void *mailbox);
+XBT_PRIVATE void MSG_mailbox_free(void *mailbox);
 
 /* \brief MSG_mailbox_free - release a mailbox from the memory.
  *
@@ -38,7 +39,7 @@ void MSG_mailbox_free(void *mailbox);
  *
  * \see      MSG_mailbox_destroy.
  */
-void MSG_mailbox_free(void *mailbox);
+XBT_PRIVATE void MSG_mailbox_free(void *mailbox);
 
 /* \brief MSG_mailbox_get_by_alias - get a mailbox from its alias.
  *
@@ -107,23 +108,5 @@ XBT_PUBLIC(int)
 MSG_mailbox_get_count_host_waiting_tasks(msg_mailbox_t mailbox,
                                          msg_host_t host);
 
-#ifdef MSG_USE_DEPRECATED
-/* \brief MSG_mailbox_get_by_channel - get a mailbox of the specified host from its channel.
- *
- * The function MSG_mailbox_get_by_channel returns the mailbox of the
- * specified host from the channel specified by the parameter
- * channel. If the mailbox does not exists, the function fails.
- *
- * \param host      The host containing he mailbox to get.
- * \param channel   The channel used to identify the mailbox.
- *
- * \return The mailbox of the specified host associated the channel
- *         specified as parameter.
- *
- */
-XBT_PUBLIC(msg_mailbox_t)
-    MSG_mailbox_get_by_channel(msg_host_t host, m_channel_t channel);
-#endif
-
 SG_END_DECL()
 #endif                          /* !MSG_MAILBOX_H */