X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fcf3b4aa4934674a5c928945a03b7e8356da2d03..32bb578d12cf89ae05867b09a57c6933127fd513:/src/xbt/xbt_main.c

diff --git a/src/xbt/xbt_main.c b/src/xbt/xbt_main.c
index 8b9b4155f4..026641b33b 100644
--- a/src/xbt/xbt_main.c
+++ b/src/xbt/xbt_main.c
@@ -50,14 +50,6 @@ int xbt_pagebits = 0;
 static void xbt_preinit(void) _XBT_GNUC_CONSTRUCTOR(200);
 static void xbt_postexit(void);
 
-#ifdef _WIN32
-# undef _XBT_NEED_INIT_PRAGMA
-#endif
-
-#ifdef _XBT_NEED_INIT_PRAGMA
-#pragma init (xbt_preinit)
-#endif
-
 #ifdef _WIN32
 #include <windows.h>
 
@@ -137,6 +129,8 @@ static void xbt_postexit(void)
 /** @brief Initialize the xbt mechanisms. */
 void xbt_init(int *argc, char **argv)
 {
+  xbt_set_terminate();
+
   if (xbt_initialized++) {
     XBT_DEBUG("XBT was initialized %d times.", xbt_initialized);
     return;
@@ -150,14 +144,6 @@ void xbt_init(int *argc, char **argv)
   xbt_log_init(argc, argv);
 }
 
-/** @brief Finalize the xbt mechanisms.
- *  @warning this function is deprecated. Just don't call it, there is nothing more to do to finalize xbt*/
-void xbt_exit()
-{
-  XBT_WARN("This function is deprecated, you shouldn't use it");
-}
-
-
 /* these two functions belong to xbt/sysdep.h, which have no corresponding .c file */
 /** @brief like free, but you can be sure that it is a function  */
 void xbt_free_f(void *p)