X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/047faaf9f860833fec42238f3f0df8ae518a4cc4..215ed67257173f5e26c9489ec96c4ced08d1614a:/include/msg/datatypes.h?ds=sidebyside

diff --git a/include/msg/datatypes.h b/include/msg/datatypes.h
index 2a7c810abc..116dbd1bdc 100644
--- a/include/msg/datatypes.h
+++ b/include/msg/datatypes.h
@@ -9,7 +9,7 @@
 #define MSG_DATATYPE_H
 #include "xbt/misc.h"
 
-BEGIN_DECL()
+SG_BEGIN_DECL()
 
 /* ******************************** Host ************************************ */
 /** @defgroup m_datatypes_management_details */
@@ -42,7 +42,7 @@ typedef struct simdata_task *simdata_task_t;
 /** @brief Task datatype 
     @ingroup m_datatypes_management_details */
 typedef struct m_task {
-  char *name;			/**< @brief host name if any */
+  char *name;			/**< @brief task name if any */
   simdata_task_t simdata;	/**< @brief simulator data */
   void *data;			/**< @brief user data */
 } s_m_task_t;
@@ -118,38 +118,11 @@ typedef enum {
   MSG_HOST_FAILURE, /**< @brief System shutdown. The host on which you are
       running has just been rebooted. Free your datastructures and
       return now !*/
+  MSG_TASK_CANCELLED, /**< @brief Cancelled task. This task has been cancelled 
+			by somebody!*/
   MSG_FATAL /**< @brief You've done something wrong. You'd better look at it... */
 } MSG_error_t;
 /** @} */
 
-
-/** @deprecated MSG verbosity
-    @ingroup m_datatypes_management
-*/
-typedef enum {
-  MSG_SILENT = 0,
-  MSG_SOME,
-  MSG_VERBOSE
-} MSG_outputmode_t;
-
-
-/** @deprecated Network sharing mechanism
-    @ingroup m_datatypes_management
-    @brief Sharing policy : 0 means uninitialized value
-*/
-typedef enum {
-  MSG_STORE_AND_FORWARD = 1, /**<  Packet level simulation of communications. Bad */
-  MSG_TCP                    /**<  Continuous model of network communications. Good  */
-} MSG_sharing_t;
-
-/** @deprecated Link datatype  
- *  @ingroup m_datatypes_management
- *    The notion of <em>link</em> was present in the earliest versions of MSG.  
- *    It was an agglomeration of communicating resources representing a set of
- *    physical network links. This abstraction a disappeared because in real-life,
- *    it is generally not possible to interact directly with a link...
- */
-typedef struct m_link *m_link_t;
-
-END_DECL()
+SG_END_DECL()
 #endif