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 scm.gforge.inria.fr:/gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
instr
/
instr_interface.c
diff --git
a/src/instr/instr_interface.c
b/src/instr/instr_interface.c
index
a2ff8b3
..
123156b
100644
(file)
--- a/
src/instr/instr_interface.c
+++ b/
src/instr/instr_interface.c
@@
-1,4
+1,4
@@
-/* Copyright (c) 2010-201
4
. The SimGrid Team.
+/* Copyright (c) 2010-201
5
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-6,7
+6,6
@@
#include "simgrid_config.h"
#include "simgrid_config.h"
-#ifdef HAVE_TRACING
#include "instr/instr_private.h"
#include "surf/surf.h"
#include "surf/surf_private.h"
#include "instr/instr_private.h"
#include "surf/surf.h"
#include "surf/surf_private.h"
@@
-1164,5
+1163,3
@@
void TRACE_resume (void)
{
instr_resume_tracing();
}
{
instr_resume_tracing();
}
-
-#endif /* HAVE_TRACING */