-/* Copyright (c) 2004, 2005, 2007, 2008, 2009, 2010. 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. */
-
-#ifndef MSG_DATATYPE_H
-#define MSG_DATATYPE_H
-#include "xbt/misc.h"
-#include "xbt/file_stat.h"
-#include "simgrid_config.h" // for HAVE_TRACING
-
-SG_BEGIN_DECL()
-
-/* ******************************** Host ************************************ */
-
-typedef struct simdata_host *simdata_host_t;
-
-typedef struct m_host {
- char *name; /**< @brief host name if any */
- simdata_host_t simdata; /**< @brief simulator data */
- void *data; /**< @brief user data */
-} s_m_host_t;
-
-/** @brief Host datatype
- @ingroup m_host_management
-
- A <em>location</em> (or <em>host</em>) is any possible place where
- a process may run. Thus it is represented as a <em>physical
- resource with computing capabilities</em>, some <em>mailboxes</em>
- to enable running process to communicate with remote ones, and
- some <em>private data</em> that can be only accessed by local
- process.
- */
-typedef struct m_host *m_host_t;
-
-/* ******************************** Task ************************************ */
-
-typedef struct simdata_task *simdata_task_t;
-
-typedef struct m_task {
- char *name; /**< @brief task name if any */
- simdata_task_t simdata; /**< @brief simulator data */
- void *data; /**< @brief user data */
-#ifdef HAVE_TRACING
- long long int counter; /* task unique identifier for instrumentation */
- char *category; /* task category for instrumentation */
-#endif
-} s_m_task_t;
-
-/** @brief Task datatype
- @ingroup m_task_management
-
- A <em>task</em> may then be defined by a <em>computing
- amount</em>, a <em>message size</em> and some <em>private
- data</em>.
- */
-typedef struct m_task *m_task_t;
-
-
-/* ******************************** File ************************************ */
-typedef struct simdata_file *simdata_file_t;
-
-typedef struct msg_file {
- char *name; /**< @brief file name */
- simdata_file_t simdata; /**< @brief simulator data */
- void *data; /**< @brief user data */
-} s_msg_file_t;
-
-/** @brief File datatype.
- @ingroup msg_file_management
-
- You should consider this as an opaque object.
- */
-typedef struct msg_file *msg_file_t;
-
-typedef s_file_stat_t s_msg_stat_t, *msg_stat_t;
-
-
-/*************** Begin GPU ***************/
-typedef struct simdata_gpu_task *simdata_gpu_task_t;
-
-typedef struct m_gpu_task {
- char *name; /**< @brief task name if any */
- simdata_gpu_task_t simdata; /**< @brief simulator data */
-#ifdef HAVE_TRACING
- long long int counter; /* task unique identifier for instrumentation */
- char *category; /* task category for instrumentation */
-#endif
-} s_m_gpu_task_t;
-
-/** @brief GPU task datatype
- @ingroup m_task_management
-
- A <em>task</em> may then be defined by a <em>computing
- amount</em>, a <em>dispatch latency</em> and a <em>collect latency</em>.
- \see m_task_management
-*/
-typedef struct m_gpu_task *m_gpu_task_t;
-/*************** End GPU ***************/
-
-/**
- * \brief @brief Communication action.
- * \ingroup m_datatypes_management
- *
- * Communication actions transfer tasks between processes.
- * For a given task, the sender and the receiver have distinct objects.
- */
-typedef struct msg_comm *msg_comm_t;
-
-/** \brief Default value for an uninitialized #m_task_t.
- \ingroup m_task_management
-*/
-#define MSG_TASK_UNINITIALIZED NULL
-
-/* ****************************** Process *********************************** */
-
-/** @brief Process datatype.
- @ingroup m_process_management
-
- A process may be defined as a <em>code</em>, with some
- <em>private data</em>, executing in a <em>location</em>.
-
- You should not access directly to the fields of the pointed
- structure, but always use the provided API to interact with
- processes.
- */
-typedef struct s_smx_process *m_process_t;
-
-#ifdef MSG_USE_DEPRECATED
-typedef int m_channel_t;
-#endif
-
-/* ******************************** Mailbox ************************************ */
-
-/** @brief Mailbox datatype
- @ingroup m_datatypes_management
- */
-typedef struct s_smx_rvpoint *msg_mailbox_t;
-
-
-SG_END_DECL()
-#endif
+#warning You should now include directly simgrid/msg.h instead of msg/datatypes.h
+#include "simgrid/msg.h"
