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
cosmetics from patch review
[simgrid.git]
/
src
/
xbt
/
mmalloc
/
mm_legacy.c
diff --git
a/src/xbt/mmalloc/mm_legacy.c
b/src/xbt/mmalloc/mm_legacy.c
index
2c1a0d5
..
1652eb4
100644
(file)
--- a/
src/xbt/mmalloc/mm_legacy.c
+++ b/
src/xbt/mmalloc/mm_legacy.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
@@
-11,12
+11,12
@@
#include <dlfcn.h>
#include <dlfcn.h>
-#include "
../..
/mc/mc_base.h"
+#include "
src
/mc/mc_base.h"
#include "mmprivate.h"
#include "mmprivate.h"
-#include "xbt_modinter.h"
-#include "internal_config.h"
+#include "
src/
xbt_modinter.h"
+#include "
src/
internal_config.h"
#include <math.h>
#include <math.h>
-#include "
..
/mc/mc_protocol.h"
+#include "
src
/mc/mc_protocol.h"
/* ***** Whether to use `mmalloc` of the undrlying malloc ***** */
/* ***** Whether to use `mmalloc` of the undrlying malloc ***** */
@@
-50,7
+50,8
@@
xbt_mheap_t mmalloc_set_current_heap(xbt_mheap_t new_heap)
return heap;
}
return heap;
}
-#ifdef MMALLOC_WANT_OVERRIDE_LEGACY
+/* Override the malloc-like functions if MC is activated at compile time */
+#if HAVE_MC
/* ***** Temporary allocator
*
/* ***** Temporary allocator
*
@@
-255,4
+256,4
@@
void free(void *p)
mfree(mdp, p);
UNLOCK(mdp);
}
mfree(mdp, p);
UNLOCK(mdp);
}
-#endif /*
WANT_MALLOC_OVERRIDE
*/
+#endif /*
HAVE_MC
*/