From 6cc8d697ad95ae3878051e9d81fe072ce047ddf5 Mon Sep 17 00:00:00 2001 From: Nikias Bassen Date: Mon, 20 Sep 2021 01:06:27 +0200 Subject: Check availability of constructor attribute and use it on Windows in favor of DllMain --- src/activation.c | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-) (limited to 'src') diff --git a/src/activation.c b/src/activation.c index ab1c204..ff71ef2 100644 --- a/src/activation.c +++ b/src/activation.c @@ -101,7 +101,6 @@ static void internal_libideviceactivation_deinit(void) } #ifdef WIN32 - typedef volatile struct { LONG lock; int state; @@ -121,7 +120,29 @@ static void thread_once(thread_once_t *once_control, void (*init_routine)(void)) } InterlockedExchange(&(once_control->lock), 0); } +#else +static pthread_once_t init_once = PTHREAD_ONCE_INIT; +static pthread_once_t deinit_once = PTHREAD_ONCE_INIT; +#define thread_once pthread_once +#endif + +#ifndef HAVE_ATTRIBUTE_CONSTRUCTOR + #if defined(__llvm__) || defined(__GNUC__) + #define HAVE_ATTRIBUTE_CONSTRUCTOR + #endif +#endif + +#ifdef HAVE_ATTRIBUTE_CONSTRUCTOR +static void __attribute__((constructor)) libideviceactivation_initialize(void) +{ + thread_once(&init_once, internal_libideviceactivation_init); +} +static void __attribute__((destructor)) libideviceactivation_deinitialize(void) +{ + thread_once(&deinit_once, internal_libideviceactivation_deinit); +} +#elif defined(WIN32) BOOL WINAPI DllMain(HINSTANCE hModule, DWORD dwReason, LPVOID lpReserved) { switch (dwReason) { @@ -136,25 +157,10 @@ BOOL WINAPI DllMain(HINSTANCE hModule, DWORD dwReason, LPVOID lpReserved) } return 1; } - #else - -static pthread_once_t init_once = PTHREAD_ONCE_INIT; -static pthread_once_t deinit_once = PTHREAD_ONCE_INIT; - -static void __attribute__((constructor)) libideviceactivation_initialize(void) -{ - pthread_once(&init_once, internal_libideviceactivation_init); -} - -static void __attribute__((destructor)) libideviceactivation_deinitialize(void) -{ - pthread_once(&deinit_once, internal_libideviceactivation_deinit); -} - +#warning No compiler support for constructor/destructor attributes, some features might not be available. #endif - static int debug_level = 0; IDEVICE_ACTIVATION_API void idevice_activation_set_debug_level(int level) { -- cgit v1.1-32-gdbae