A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix warnings + refactor
[simgrid.git]
/
include
/
xbt.h
diff --git
a/include/xbt.h
b/include/xbt.h
index
81c0fe1
..
5890af3
100644
(file)
--- a/
include/xbt.h
+++ b/
include/xbt.h
@@
-1,35
+1,33
@@
-/*
$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-2017. The SimGrid Team.
+ * All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
/* 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
-
-#define max(a, b) (((a) > (b))?(a):(b))
-#define min(a, b) (((a) < (b))?(a):(b))
+ * under the terms of the license (GNU LGPL) which comes with this package. */
-#
define TRUE 1
-#define
FALSE 0
+#
ifndef XBT_H
+#define
XBT_H
-#define GRAS_MAX_CHANNEL 10 /* FIXME: killme */
+#include <xbt/misc.h>
+#include <xbt/sysdep.h>
+#include <xbt/str.h>
+#include <xbt/function_types.h>
-#include <gros/sysdep.h>
+#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/swag.h>
+#include <xbt/parmap.h>
-#include <gros/dynar.h>
-#include <gros/dict.h>
-#include <gros/set.h>
+#include <xbt/config.h>
+#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 */