Specify __cdecl for the terminate handler on MSVC, fixes #197

jeremy-rifkin · Dec 31, 2024 · 0c40839 · 0c40839
1 parent d5a2043
commit 0c40839
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/utils.cpp b/src/utils.cpp
@@ -40,7 +40,7 @@ namespace cpptrace {
         }
     }
 
-    [[noreturn]] void terminate_handler() {
+    [[noreturn]] void MSVC_CDECL terminate_handler() {
         // TODO: Support std::nested_exception?
         try {
             auto ptr = std::current_exception();

diff --git a/src/utils/common.hpp b/src/utils/common.hpp
@@ -25,6 +25,12 @@
  #define NODISCARD
 #endif
 
+#if IS_MSVC
+ #define MSVC_CDECL __cdecl
+#else
+ #define MSVC_CDECL
+#endif
+
 namespace cpptrace {
 namespace detail {
     static const stacktrace_frame null_frame {