Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot//simgrid/simgrid

[simgrid.git] / include / gras.h

diff --git a/include/gras.h b/include/gras.h
index 90ae48f..ba1cd5a 100644 (file)
--- a/include/gras.h
+++ b/include/gras.h
@@ -1,8 +1,7 @@
-/* $Id$ */
-
 /* gras.h - Public interface to the GRAS                                    */
 
-/* Copyright (c) 2003, 2004 Martin Quinson. All rights reserved.            */
+/* Copyright (c) 2004, 2005, 2006, 2007, 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. */
@@ -10,16 +9,19 @@
 #ifndef GRAS_H
 #define GRAS_H
 
-#include <xbt.h> /* our toolbox */
+#include <xbt.h>                /* our toolbox */
+#include <xbt/ex.h>             /* There's a whole bunch of exception handling in GRAS */
 
-#include <gras/core.h> /* FIXME: killme */
 #include <gras/process.h>
+#include <gras/module.h>
 #include <gras/virtu.h>
-#include <gras/cond.h>
+#include <gras/emul.h>
 
 #include <gras/transport.h>
-#include <gras/datadesc.h>
 #include <gras/messages.h>
 #include <gras/timer.h>
 
-#endif /* GRAS_H */
+XBT_PUBLIC(void) gras_init(int *argc, char **argv);
+XBT_PUBLIC(void) gras_exit(void);
+
+#endif                          /* GRAS_H */