From 32bb578d12cf89ae05867b09a57c6933127fd513 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sun, 7 Aug 2016 20:29:02 +0200 Subject: [PATCH 1/1] kill obsolete code This seems to be an attempt to get windows running our library constructors, that are used to create the structures such as log channels before the main kicks in. --- include/xbt/base.h | 1 - src/xbt/xbt_main.c | 8 -------- 2 files changed, 9 deletions(-) diff --git a/include/xbt/base.h b/include/xbt/base.h index 259c84c893..4ecf84e014 100644 --- a/include/xbt/base.h +++ b/include/xbt/base.h @@ -58,7 +58,6 @@ # define _XBT_GNUC_CONSTRUCTOR(prio) __attribute__((__constructor__)) # define _XBT_GNUC_DESTRUCTOR(prio) __attribute__((__destructor__)) # endif -# undef _XBT_NEED_INIT_PRAGMA #if defined(__GNUC__) # define XBT_ALWAYS_INLINE inline __attribute__ ((always_inline)) diff --git a/src/xbt/xbt_main.c b/src/xbt/xbt_main.c index 13ec9e30b5..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 -- 2.20.1