From a041a135b370885075a866be172e34abc6cfbbcd Mon Sep 17 00:00:00 2001
From: navarro <navarro@caraja.(none)>
Date: Mon, 13 Feb 2012 17:44:19 +0100
Subject: [PATCH 1/1] Use only one variable and protect for windows only

---
 src/xbt/xbt_main.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/xbt/xbt_main.c b/src/xbt/xbt_main.c
index 36c5edfe4a..21554b152d 100644
--- a/src/xbt/xbt_main.c
+++ b/src/xbt/xbt_main.c
@@ -81,7 +81,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason,
 /* Should not be necessary but for some reason,
  * DllMain is called twice at attachment and
  * at detachment.*/
-static int xbt_dll_process_is_dattached = 0;
 static int xbt_dll_process_is_attached = 0;
 
 /* see also http://msdn.microsoft.com/en-us/library/ms682583%28VS.85%29.aspx */
@@ -93,7 +92,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason,
 		  && xbt_dll_process_is_attached == 0) {
 	  xbt_preinit();
   } else if (fdwReason == DLL_PROCESS_DETACH
-		  && xbt_dll_process_is_dattached == 0) {
+		  && xbt_dll_process_is_attached == 1) {
       xbt_postexit();
   }
   return 1;
@@ -104,7 +103,9 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason,
 
 static void xbt_preinit(void)
 {
+#ifdef _XBT_WIN32
   xbt_dll_process_is_attached = 1;
+#endif
 #ifdef MMALLOC_WANT_OVERIDE_LEGACY
   mmalloc_preinit();
 #endif
@@ -151,7 +152,9 @@ static void xbt_preinit(void)
 
 static void xbt_postexit(void)
 {
-  xbt_dll_process_is_dattached = 1;
+#ifdef _XBT_WIN32
+  xbt_dll_process_is_attached = 0;
+#endif
   xbt_trp_postexit();
   xbt_datadesc_postexit();
 
-- 
2.20.1