Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

[simgrid.git] / src / xbt / xbt_main.cpp

diff --git a/src/xbt/xbt_main.cpp b/src/xbt/xbt_main.cpp
index d90feb101c3e66f8c3940374d9b1b14787244212..9176b29286769760a1ee426a1f3dca0f89a904c0 100644 (file)
--- a/src/xbt/xbt_main.cpp
+++ b/src/xbt/xbt_main.cpp
@@ -1,7 +1,6 @@
 /* module handling                                                          */
 
-/* Copyright (c) 2006-2014. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2006-2017. The SimGrid Team. All rights reserved.          */
 
 /* 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. */
@@ -95,9 +94,7 @@ static void xbt_preinit(void) {
   _set_output_format(_TWO_DIGIT_EXPONENT);
 #endif
   xbt_log_preinit();
-  xbt_backtrace_preinit();
   xbt_os_thread_mod_preinit();
-  xbt_fifo_preinit();
   xbt_dict_preinit();
    
   srand(seed);
@@ -111,14 +108,12 @@ static void xbt_postexit(void)
 {
   if(!_sg_do_clean_atexit) return;
   xbt_initialized--;
-  xbt_backtrace_postexit();
-  xbt_fifo_postexit();
   xbt_dict_postexit();
   xbt_os_thread_mod_postexit();
   xbt_dynar_free(&xbt_cmdline);
   xbt_log_postexit();
   free(xbt_binary_name);
-#if HAVE_MC
+#if SIMGRID_HAVE_MC
   mmalloc_postexit();
 #endif
 }