Also move the module headers

[simgrid.git] / include / gras.h

diff --git a/include/gras.h b/include/gras.h
index c72909b..ce3f387 100644 (file)
--- a/include/gras.h
+++ b/include/gras.h
@@ -11,22 +11,13 @@
 #ifndef GRAS_H
 #define GRAS_H
 
-/* Oli's macro */
-#ifndef GS_FAILURE_CONTEXT
-#  define GS_FAILURE_CONTEXT
-#endif /* GS_FAILURE_CONTEXT */
-
-#define GS_FAILURE(str) \
-     (fprintf(stderr, "FAILURE: %s(%s:%d)" GS_FAILURE_CONTEXT "%s\n", __func__, __FILE__, __LINE__, (str)), \
-      abort())
-
 #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 */
+#define GRAS_MAX_CHANNEL 10 /* FIXME: killme */
 
 #include <gras/error.h>
 #include <gras/log.h>
@@ -39,17 +30,15 @@
 
 #include <gras/config.h>
 
-#include <gras/core.h>
+#include <gras/core.h> /* FIXME: killme */
+#include <gras/process.h>
+#include <gras/virtu.h>
+#include <gras/cond.h>
 
 #include <gras/transport.h>
 #include <gras/datadesc.h>
-//#include <gras/datadesc_simple.h>
-#include <gras/socket.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>