X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/75ffa801579aeb214b8d95290b76c96a605a2422..20029610b4da98563453de7218813092b6bc95b7:/include/gras.h

diff --git a/include/gras.h b/include/gras.h
index 5bb8012244..17dffb2d82 100644
--- a/include/gras.h
+++ b/include/gras.h
@@ -2,54 +2,24 @@
 
 /* gras.h - Public interface to the GRAS                                    */
 
-/* Authors: Martin Quinson                                                  */
-/* Copyright (C) 2003 the OURAGAN project.                                  */
+/* Copyright (c) 2003, 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 GRAS_H
 #define GRAS_H
 
-/* Oli's macro */
-#ifndef GS_FAILURE_CONTEXT
-#  define GS_FAILURE_CONTEXT
-#endif /* GS_FAILURE_CONTEXT */
+#include <xbt.h> /* our toolbox */
 
-#define GS_FAILURE(str) \
-     (fprintf(stderr, "FAILURE: %s(%s:%d)" GS_FAILURE_CONTEXT "%s\n", __func__, __FILE__, __LINE__, (str)), \
-      abort())
-
-#define aligned(v, a) (((v) + (a - 1)) & ~(a - 1))
-#define max(a, b) (((a) > (b))?(a):(b))
-#define min(a, b) (((a) < (b))?(a):(b))
-
-#define TRUE  1
-#define FALSE 0
-
-/* end of Oli's cruft */
-
-#include <gras/error.h>
-#include <gras/log.h>
-
-#include <gras/module.h>
-
-#include <gras/dynar.h>
-#include <gras/dict.h>
-
-#include <gras/config.h>
-
-#include <gras/core.h>
+#include <gras/core.h> /* FIXME: killme */
+#include <gras/process.h>
+#include <gras/virtu.h>
+#include <gras/emul.h>
 
 #include <gras/transport.h>
-#include <gras/datadesc_simple.h>
-#include <gras/socket.h>
+#include <gras/datadesc.h>
 #include <gras/messages.h>
-
-#include <gras/data_description.h>
-#include <gras/dd_type_bag.h>
-
-#include <gras/modules/base.h>
-#include <gras/modules/bandwidth.h>
+#include <gras/timer.h>
 
 #endif /* GRAS_H */