fix: abort conflict

MiroKaku · Jun 18, 2022 · 4f31ba8 · 4f31ba8
1 parent 356220f
commit 4f31ba8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/ucrt/misc/terminate.cpp b/src/ucrt/misc/terminate.cpp
@@ -8,6 +8,14 @@
 
 #include <corecrt_internal.h>
 #include <corecrt_terminate.h>
+#include <vcstartup_internal.h>
+
+
+// fix: abort not implemented after 19043
+// alternatename: https://devblogs.microsoft.com/oldnewthing/20200731-00/?p=104024
+extern "C" void __cdecl _abort_default();
+_VCRT_DECLARE_ALTERNATE_NAME(abort, _abort_default);
+
 
 static terminate_handler __cdecl get_terminate_or_default(
     __acrt_ptd const* const ptd

diff --git a/src/ucrt/startup/abort.cpp b/src/ucrt/startup/abort.cpp
@@ -9,7 +9,6 @@
 *******************************************************************************/
 
 #include <corecrt_internal.h>
-#include <signal.h>
 #include <stdlib.h>
 
 #ifdef _DEBUG
@@ -43,8 +42,7 @@ extern "C" unsigned int __abort_behavior = _INIT_ABORT_BEHAVIOR;
 *
 *******************************************************************************/
 
-#if (WDK_NTDDI_VERSION >= NTDDI_WIN10_FE)
-extern "C" void __cdecl abort()
+extern "C" void __cdecl _abort_default()
 {
 #ifdef _DEBUG
     if (__abort_behavior & _WRITE_ABORT_MSG)
@@ -60,7 +58,6 @@ extern "C" void __cdecl abort()
 
     __fastfail(FAST_FAIL_FATAL_APP_EXIT);
 }
-#endif // WDK_NTDDI_VERSION >= NTDDI_WIN10_FE
 
 /***
 *unsigned int _set_abort_behavior(unsigned int, unsigned int) - set the behavior on abort