From e8fe2eeb59f0515a61fb97fe85ea8291907a03cd Mon Sep 17 00:00:00 2001 From: lightningterror Date: Sat, 17 Aug 2019 22:10:51 +0200 Subject: [PATCH] Revert "3rdparty/pthreads4w: Fixup process exit logic. (#3056)" This reverts commit af6f04020225eaf3239bc9b4542f4afd84560540. --- 3rdparty/pthreads4w/autostatic.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/3rdparty/pthreads4w/autostatic.c b/3rdparty/pthreads4w/autostatic.c index 8eaae6f8e7..092aff2aee 100644 --- a/3rdparty/pthreads4w/autostatic.c +++ b/3rdparty/pthreads4w/autostatic.c @@ -36,19 +36,15 @@ #if defined(PTW32_STATIC_LIB) -#define PCSX2_FIX 1 // Comment out to restore code to pristine state - #if defined(__MINGW64__) || defined(__MINGW32__) || defined(_MSC_VER) #include "pthread.h" #include "implement.h" -#if !PCSX2_FIX static void on_process_init(void) { pthread_win32_process_attach_np (); } -#endif static void on_process_exit(void) { @@ -56,14 +52,6 @@ static void on_process_exit(void) pthread_win32_process_detach_np (); } -#if PCSX2_FIX -static void on_process_init(void) -{ - pthread_win32_process_attach_np(); - atexit(on_process_exit); -} -#endif - #if defined(__MINGW64__) || defined(__MINGW32__) # define attribute_section(a) __attribute__((section(a))) #elif defined(_MSC_VER) @@ -74,9 +62,7 @@ attribute_section(".ctors") void *gcc_ctor = on_process_init; attribute_section(".dtors") void *gcc_dtor = on_process_exit; attribute_section(".CRT$XCU") void *msc_ctor = on_process_init; -#if !PCSX2_FIX attribute_section(".CRT$XPU") void *msc_dtor = on_process_exit; -#endif #endif /* defined(__MINGW64__) || defined(__MINGW32__) || defined(_MSC_VER) */