From 694215fc2015850eca75bee03d004f0cec456ac4 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Mon, 2 Jul 2012 11:45:35 +0200 Subject: [PATCH] Move compatibility typedefs in section MSG_USE_DEPRECATED. --- include/msg/datatypes.h | 14 +++++++------- include/msg/msg.h | 5 +++-- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/include/msg/datatypes.h b/include/msg/datatypes.h index c5c2d059fb..7560bd39f6 100644 --- a/include/msg/datatypes.h +++ b/include/msg/datatypes.h @@ -141,14 +141,14 @@ typedef struct msg_comm *msg_comm_t; */ typedef struct s_smx_process *msg_process_t; -/* Compatibility typedefs */ -typedef msg_process_t m_process_t; -typedef msg_host_t m_host_t; -typedef msg_task_t m_task_t; -typedef msg_gpu_task_t m_gpu_task_t; - #ifdef MSG_USE_DEPRECATED -typedef int m_channel_t; + +/* Compatibility typedefs */ +typedef int m_channel_t; +typedef msg_gpu_task_t m_gpu_task_t; +typedef msg_host_t m_host_t; +typedef msg_process_t m_process_t; +typedef msg_task_t m_task_t; #endif SG_END_DECL() diff --git a/include/msg/msg.h b/include/msg/msg.h index a6a21cbbe5..1a9986c473 100644 --- a/include/msg/msg.h +++ b/include/msg/msg.h @@ -31,8 +31,6 @@ typedef enum { } msg_error_t; /** @} */ -typedef msg_error_t MSG_error_t; - /************************** Global ******************************************/ XBT_PUBLIC(void) MSG_config(const char *name, ...); /** \ingroup msg_simulation @@ -265,6 +263,9 @@ XBT_PUBLIC(msg_error_t) msg_error_t MSG_action_trace_run(char *path); #ifdef MSG_USE_DEPRECATED + +typedef msg_error_t MSG_error_t; + #define MSG_global_init(argc, argv) MSG_init(argc,argv) #define MSG_global_init_args(argc, argv) MSG_init(argc,argv) -- 2.20.1