Use msg_process_t instead of m_process_t

[simgrid.git] / include / msg / datatypes.h

diff --git a/include/msg/datatypes.h b/include/msg/datatypes.h
index 79fc90a..afd2441 100644 (file)
--- a/include/msg/datatypes.h
+++ b/include/msg/datatypes.h
@@ -1,5 +1,4 @@
-/* Copyright (c) 2004, 2005, 2007, 2008, 2009, 2010. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2004-2012. 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. */
@@ -31,13 +30,14 @@ typedef struct s_smx_rvpoint *msg_mailbox_t;
 /* ******************************** Host ************************************ */
 
 typedef struct m_host {
+  xbt_swag_t vms;
   smx_host_t smx_host;          /**< SIMIX representation of this host   */
 #ifdef MSG_USE_DEPRECATED
   msg_mailbox_t *mailboxes;     /**< the channels  */
 #endif
 } s_m_host_t;
 
-/** @brief Host datatype  
+/** @brief Host datatype.
     @ingroup m_host_management
 
     A <em>location</em> (or <em>host</em>) is any possible place where
@@ -63,7 +63,7 @@ typedef struct m_task {
 #endif
 } s_m_task_t;
 
-/** @brief Task datatype  
+/** @brief Task datatype.
     @ingroup m_task_management 
 
     A <em>task</em> may then be defined by a <em>computing
@@ -104,7 +104,7 @@ typedef struct m_gpu_task {
 #endif
 } s_m_gpu_task_t;
 
-/** @brief GPU task datatype
+/** @brief GPU task datatype.
     @ingroup m_task_management
 
     A <em>task</em> may then be defined by a <em>computing
@@ -139,13 +139,14 @@ typedef struct msg_comm *msg_comm_t;
     structure, but always use the provided API to interact with
     processes.
  */
-typedef struct s_smx_process *m_process_t;
+typedef struct s_smx_process *msg_process_t;
+
+/* Compatibility typedefs */
+typedef msg_process_t m_process_t;
 
 #ifdef MSG_USE_DEPRECATED
 typedef int m_channel_t;
 #endif
 
-
-
 SG_END_DECL()
 #endif