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
Partially revert previous change: we indeed want a virtualization layer for time...
[simgrid.git]
/
include
/
xbt.h
diff --git
a/include/xbt.h
b/include/xbt.h
index
083286d
..
4cd44e7
100644
(file)
--- a/
include/xbt.h
+++ b/
include/xbt.h
@@
-2,26
+2,19
@@
/* xbt.h - Public interface to the xbt (gras's toolbox) */
/* 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
/* 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
#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/sysdep.h>
+#include <xbt/function_types.h>
-#include <xbt/
error
.h>
+#include <xbt/
asserts
.h>
#include <xbt/log.h>
#include <xbt/module.h>
#include <xbt/log.h>
#include <xbt/module.h>
@@
-29,7
+22,11
@@
#include <xbt/dynar.h>
#include <xbt/dict.h>
#include <xbt/set.h>
#include <xbt/dynar.h>
#include <xbt/dict.h>
#include <xbt/set.h>
+#include <xbt/swag.h>
+#include <xbt/heap.h>
+#include <xbt/peer.h>
#include <xbt/config.h>
#include <xbt/config.h>
+#include <xbt/cunit.h>
#endif /* xbt_H */
#endif /* xbt_H */