[PATCH] msvcrt: Don't include MSVC 8.0+ exit functions in SOs for older DLLs

Alex Henrie alexhenrie24 at gmail.com
Wed Jan 10 00:21:43 CST 2018


Signed-off-by: Alex Henrie <alexhenrie24 at gmail.com>
---
 dlls/msvcrt/exit.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c
index d0e93d7b98..7e1805569c 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.15.1




More information about the wine-devel mailing list