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

diff --git a/src/xbt/xbt_main.c b/src/xbt/xbt_main.c
index 3451b60527..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;