From b6ec8980c57c8278ceb57f659693246212566ae4 Mon Sep 17 00:00:00 2001 From: Alex Henrie Date: Tue, 9 Jan 2018 23:21:43 -0700 Subject: [PATCH] msvcrt: Don't include MSVC 8.0+ exit functions in SOs for older DLLs. Signed-off-by: Alex Henrie Signed-off-by: Piotr Caban Signed-off-by: Alexandre Julliard --- dlls/msvcrt/exit.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index d0e93d7b98e..7e1805569c4 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -204,6 +204,7 @@ void CDECL MSVCRT_abort(void) MSVCRT__exit(3); } +#if _MSVCR_VER>=80 /********************************************************************* * _set_abort_behavior (MSVCR80.@) */ @@ -218,6 +219,7 @@ unsigned int CDECL MSVCRT__set_abort_behavior(unsigned int flags, unsigned int m MSVCRT_abort_behavior = (MSVCRT_abort_behavior & ~mask) | (flags & mask); return old; } +#endif /********************************************************************* * _wassert (MSVCRT.@) @@ -346,6 +348,8 @@ int CDECL MSVCRT_atexit(void (*func)(void)) return MSVCRT__onexit((MSVCRT__onexit_t)func) == (MSVCRT__onexit_t)func ? 0 : -1; } +#if _MSVCR_VER>=140 + /********************************************************************* * _crt_atexit (UCRTBASE.@) */ @@ -462,6 +466,8 @@ void CDECL _register_thread_local_exe_atexit_callback(_tls_callback_type callbac tls_atexit_callback = callback; } +#endif /* _MSVCR_VER>=140 */ + #if _MSVCR_VER>=71 /********************************************************************* * _set_purecall_handler (MSVCR71.@) -- 2.11.4.GIT