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
Add condition before use a mmalloc function.
[simgrid.git]
/
src
/
xbt
/
xbt_main.c
diff --git
a/src/xbt/xbt_main.c
b/src/xbt/xbt_main.c
index
16d5d75
..
47bef26
100644
(file)
--- a/
src/xbt/xbt_main.c
+++ b/
src/xbt/xbt_main.c
@@
-79,7
+79,9
@@
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {
#endif
static void xbt_preinit(void) {
#endif
static void xbt_preinit(void) {
- mmalloc_preinit();
+ #ifdef HAVE_MMAP
+ mmalloc_preinit();
+ #endif
xbt_log_preinit();
/* Connect our log channels: that must be done manually under windows */
xbt_log_preinit();
/* Connect our log channels: that must be done manually under windows */
@@
-123,7
+125,9
@@
static void xbt_postexit(void) {
xbt_log_postexit();
free(xbt_binary_name);
xbt_log_postexit();
free(xbt_binary_name);
+#ifdef HAVE_MMAP
mmalloc_postexit();
mmalloc_postexit();
+#endif
}
/** @brief Initialize the xbt mechanisms. */
}
/** @brief Initialize the xbt mechanisms. */