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

diff --git a/include/xbt.h b/include/xbt.h
index 083286d1e4..08d5228b1a 100644
--- a/include/xbt.h
+++ b/include/xbt.h
@@ -2,23 +2,15 @@
 
 /* xbt.h - Public interface to the xbt (gras's toolbox)                   */
 
-/* Authors: Martin Quinson                                                  */
-/* Copyright (C) 2004 the OURAGAN project.                                  */
+/* Copyright (c) 2004 Martin Quinson. 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. */
+ * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #ifndef xbt_H
 #define xbt_H
 
-#define max(a, b) (((a) > (b))?(a):(b))
-#define min(a, b) (((a) < (b))?(a):(b))
-
-#define TRUE  1
-#define FALSE 0
-
-#define GRAS_MAX_CHANNEL 10 /* FIXME: killme */
-
+#include <xbt/misc.h>
 #include <xbt/sysdep.h>
 
 #include <xbt/error.h>
@@ -29,6 +21,8 @@
 #include <xbt/dynar.h>
 #include <xbt/dict.h>
 #include <xbt/set.h>
+#include <xbt/swag.h>
+#include <xbt/heap.h>
 
 #include <xbt/config.h>