From: mquinson <mquinson@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Fri, 9 Apr 2010 16:14:21 +0000 (+0000)
Subject: allow the use of MSG_TIMEOUT_FAILURE if MSG_USE_DEPRECATED is declared)
X-Git-Tag: SVN~214
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/6eb33c21262017b238ab30ea3616bbb8116f2396

allow the use of MSG_TIMEOUT_FAILURE if MSG_USE_DEPRECATED is declared)

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7526 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---

diff --git a/ChangeLog b/ChangeLog
index 041d66c6a7..5c28784b00 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -46,6 +46,7 @@ SimGrid (3.4-svn) unstable; urgency=low
   * Kill MSG_WARNING and MSG_FATAL return codes: they were not used
     anywere in source.
   * Rename MSG_TIMEOUT_FAILURE into MSG_TIMEOUT for sake of logic
+    (declare MSG_USE_DEPRECATED to still have the old name)
   * Add a MSG_task_set_data() function
   * About trace replay (see examples/msg/actions):
     - implement barrier
diff --git a/include/msg/msg.h b/include/msg/msg.h
index 7610386b96..14cfc9a4f9 100644
--- a/include/msg/msg.h
+++ b/include/msg/msg.h
@@ -202,6 +202,8 @@ XBT_PUBLIC(void) MSG_action_unregister(const char *action_name);
 
 
 #ifdef MSG_USE_DEPRECATED
+/* these are the functions which are deprecated. Do not use them, they may get removed in future releases */
+#define MSG_TIMEOUT_FAILURE MSG_TIMEOUT
 #define MSG_mailbox_put_with_time_out(mailbox, task, timeout) \
         MSG_mailbox_put_with_timeout(mailbox, task, timeout)