Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

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

diff --git a/src/msg/msg_private.h b/src/msg/msg_private.h
index c08ac68..e8af564 100644 (file)
--- a/src/msg/msg_private.h
+++ b/src/msg/msg_private.h
@@ -55,8 +55,8 @@ typedef struct simdata_process {
   m_channel_t put_channel;      /* used for debugging purposes */
   smx_action_t waiting_action;
   m_task_t waiting_task;
-  int argc;                     /* arguments number if any */
   char **argv;                  /* arguments table if any */
+  int argc;                     /* arguments number if any */
   MSG_error_t last_errno;       /* the last value returned by a MSG_function */
   void* data;                   /* user data */
 } s_simdata_process_t, *simdata_process_t;
@@ -93,15 +93,19 @@ XBT_PUBLIC_DATA(MSG_Global_t) msg_global;
 
 /*************************************************************/
 
-#define PROCESS_SET_ERRNO(val) \
+#ifdef MSG_USE_DEPRECATED
+#  define PROCESS_SET_ERRNO(val) \
   (((simdata_process_t) SIMIX_process_self_get_data(SIMIX_process_self()))->last_errno=val)
-#define PROCESS_GET_ERRNO() \
+#  define PROCESS_GET_ERRNO() \
   (((simdata_process_t) SIMIX_process_self_get_data(SIMIX_process_self()))->last_errno)
 #define MSG_RETURN(val) do {PROCESS_SET_ERRNO(val);return(val);} while(0)
 /* #define CHECK_ERRNO()  ASSERT((PROCESS_GET_ERRNO()!=MSG_HOST_FAILURE),"Host failed, you cannot call this function.") */
 
 /*#define CHECK_HOST()  xbt_assert(SIMIX_req_host_get_state(SIMIX_host_self())==1,\
                                   "Host failed, you cannot call this function. (state=%d)",SIMIX_req_host_get_state(SIMIX_host_self()))*/
+#else
+#  define MSG_RETURN(val) return(val)
+#endif
 #define CHECK_HOST()
 
 m_host_t __MSG_host_create(smx_host_t workstation, void *data);