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
Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
simix
/
popping.cpp
diff --git
a/src/simix/popping.cpp
b/src/simix/popping.cpp
index
ccbc8d8
..
c488326
100644
(file)
--- a/
src/simix/popping.cpp
+++ b/
src/simix/popping.cpp
@@
-5,9
+5,8
@@
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "smx_private.h"
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "smx_private.h"
-#include "xbt/fifo.h"
#include "xbt/xbt_os_thread.h"
#include "xbt/xbt_os_thread.h"
-#if HAVE_MC
+#if
SIMGRID_
HAVE_MC
#include "src/mc/mc_private.h"
#endif
#include "src/mc/mc_private.h"
#endif