X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f1068773bda2a9c50385808a643a04e4a1fc2c7a..50ddfe2f5b5035e0ed9556b334d6977ee81ff83a:/include/xbt.h

diff --git a/include/xbt.h b/include/xbt.h
index 38f65ef152..b0a6fa2e95 100644
--- a/include/xbt.h
+++ b/include/xbt.h
@@ -1,33 +1,35 @@
-/* $Id$ */
+/* xbt.h - Public interface to the xbt (SimGrid's toolbox)                  */
 
-/* gros.h - Public interface to the GROS (gras's toolbox)                   */
-
-/* Authors: Martin Quinson                                                  */
-/* Copyright (C) 2004 the OURAGAN project.                                  */
+/* Copyright (c) 2004-2018. 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 GROS_H
-#define GROS_H
+ * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#define max(a, b) (((a) > (b))?(a):(b))
-#define min(a, b) (((a) < (b))?(a):(b))
+#ifndef XBT_H
+#define XBT_H
 
-#define TRUE  1
-#define FALSE 0
+#include <xbt/misc.h>
+#include <xbt/sysdep.h>
+#include <xbt/str.h>
+#include <xbt/function_types.h>
 
-#define GRAS_MAX_CHANNEL 10 /* FIXME: killme */
+#include <xbt/asserts.h>
+#include <xbt/log.h>
 
-#include <gros/error.h>
-#include <gros/log.h>
+#include <xbt/module.h>
 
-#include <gros/module.h>
+#include <xbt/dynar.h>
+#include <xbt/dict.h>
+#include <xbt/parmap.h>
 
-#include <gros/dynar.h>
-#include <gros/dict.h>
-#include <gros/set.h>
+#include <xbt/config.h>
+#ifdef __cplusplus
+#include <xbt/config.hpp>
+#endif
+#include <xbt/cunit.h>
 
-#include <gros/config.h>
+#include <xbt/xbt_os_thread.h>
+#include <xbt/xbt_os_time.h>
 
-#endif /* GROS_H */
+#endif /* XBT_H */