Skip to content

Commit

Permalink
Check availability of constructor attribute and use it on Windows in …
Browse files Browse the repository at this point in the history
…favor of DllMain
  • Loading branch information
nikias committed Jan 6, 2022
1 parent 8bc9ccc commit 8f66cfa
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 10 deletions.
18 changes: 18 additions & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,24 @@ case ${host_os} in
esac
AM_CONDITIONAL(WIN32, test x$win32 = xtrue)

# Check if the C compiler supports __attribute__((constructor))
AC_CACHE_CHECK([wether the C compiler supports constructor/destructor attributes],
ac_cv_attribute_constructor, [
ac_cv_attribute_constructor=no
AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
[[
static void __attribute__((constructor)) test_constructor(void) {
}
static void __attribute__((destructor)) test_destructor(void) {
}
]], [])],
[ac_cv_attribute_constructor=yes]
)]
)
if test "$ac_cv_attribute_constructor" = "yes"; then
AC_DEFINE(HAVE_ATTRIBUTE_CONSTRUCTOR, 1, [Define if the C compiler supports constructor/destructor attributes])
fi

AC_ARG_WITH([dummy],
[AS_HELP_STRING([--with-dummy], [Use no USB driver at all [default=no]. This is only useful if you just want to query the device list by product type or hardware model. All other operations are no-ops or will return IRECV_E_UNSUPPORTED.])],
[],
Expand Down
28 changes: 18 additions & 10 deletions src/libirecovery.c
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,23 @@ static void _irecv_deinit(void)
static thread_once_t init_once = THREAD_ONCE_INIT;
static thread_once_t deinit_once = THREAD_ONCE_INIT;

#ifdef WIN32
#ifndef HAVE_ATTRIBUTE_CONSTRUCTOR
#if defined(__llvm__) || defined(__GNUC__)
#define HAVE_ATTRIBUTE_CONSTRUCTOR
#endif
#endif

#ifdef HAVE_ATTRIBUTE_CONSTRUCTOR
static void __attribute__((constructor)) libirecovery_initialize(void)
{
thread_once(&init_once, _irecv_init);
}

static void __attribute__((destructor)) libirecovery_deinitialize(void)
{
thread_once(&deinit_once, _irecv_deinit);
}
#elif defined(WIN32)
BOOL WINAPI DllMain(HINSTANCE hModule, DWORD dwReason, LPVOID lpReserved)
{
switch (dwReason) {
Expand All @@ -458,15 +474,7 @@ BOOL WINAPI DllMain(HINSTANCE hModule, DWORD dwReason, LPVOID lpReserved)
return 1;
}
#else
static void __attribute__((constructor)) libirecovery_initialize(void)
{
thread_once(&init_once, _irecv_init);
}

static void __attribute__((destructor)) libirecovery_deinitialize(void)
{
thread_once(&deinit_once, _irecv_deinit);
}
#warning No compiler support for constructor/destructor attributes, some features might not be available.
#endif

#ifdef HAVE_IOKIT
Expand Down

0 comments on commit 8f66cfa

Please sign in to comment.