#include "xbt/misc.h"
#include "simgrid_config.h" /*HAVE_MMAP _XBT_WIN32 */
+#include "gras_config.h" /* MMALLOC_WANT_OVERRIDE_LEGACY */
#include "time.h" /* to seed the random generator */
#include "xbt/sysdep.h"
#ifdef _XBT_WIN32
#include <windows.h>
+#ifndef __GNUC__
/* Dummy prototype to make gcc happy */
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason,
LPVOID lpvReserved);
{
if (fdwReason == DLL_PROCESS_ATTACH
&& xbt_dll_process_is_attached == 0) {
+ xbt_dll_process_is_attached = 1;
xbt_preinit();
} else if (fdwReason == DLL_PROCESS_DETACH
&& xbt_dll_process_is_attached == 1) {
+ xbt_dll_process_is_attached = 0;
xbt_postexit();
}
return 1;
}
-
+#endif
#endif
static void xbt_preinit(void)
{
-#ifdef _XBT_WIN32
- xbt_dll_process_is_attached = 1;
-#endif
-#ifdef MMALLOC_WANT_OVERIDE_LEGACY
+#ifdef MMALLOC_WANT_OVERRIDE_LEGACY
mmalloc_preinit();
#endif
xbt_log_preinit();
static void xbt_postexit(void)
{
-#ifdef _XBT_WIN32
- xbt_dll_process_is_attached = 0;
-#endif
xbt_trp_postexit();
xbt_datadesc_postexit();
xbt_os_thread_mod_postexit();
free(xbt_binary_name);
-#ifdef MMALLOC_WANT_OVERIDE_LEGACY
+#ifdef MMALLOC_WANT_OVERRIDE_LEGACY
mmalloc_postexit();
#endif
}