aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Ridgers <[email protected]>2021-11-02 15:02:28 +0100
committerMartin Ridgers <[email protected]>2021-11-02 15:29:02 +0100
commit513f459834e713b5268200ad448094bdafb82cb2 (patch)
tree8ff20590b5574d60c97da572d9dcec42461bfafa
parentRefactored ExtendablePathBuilder in an fixed/extendable pair (diff)
downloadzen-513f459834e713b5268200ad448094bdafb82cb2.tar.xz
zen-513f459834e713b5268200ad448094bdafb82cb2.zip
__debugbreak() -> ZEN_DEBUG_BREAK()
-rw-r--r--zencore/include/zencore/zencore.h6
-rw-r--r--zenserver/zenserver.cpp2
2 files changed, 7 insertions, 1 deletions
diff --git a/zencore/include/zencore/zencore.h b/zencore/include/zencore/zencore.h
index 6b98749fe..195662715 100644
--- a/zencore/include/zencore/zencore.h
+++ b/zencore/include/zencore/zencore.h
@@ -96,6 +96,12 @@
# endif
#endif
+#if ZEN_COMPILER_MSC
+# define ZEN_DEBUG_BREAK() do { __debugbreak(); } while (0)
+#else
+# define ZEN_DEBUG_BREAK() do { __builtin_trap(); } while (0)
+#endif
+
//////////////////////////////////////////////////////////////////////////
// Architecture
//
diff --git a/zenserver/zenserver.cpp b/zenserver/zenserver.cpp
index f5c38baae..abb2fe3d0 100644
--- a/zenserver/zenserver.cpp
+++ b/zenserver/zenserver.cpp
@@ -326,7 +326,7 @@ public:
if (m_DebugOptionForcedCrash)
{
- __debugbreak();
+ ZEN_DEBUG_BREAK();
}
const bool IsInteractiveMode = zen::IsInteractiveSession() && !m_TestMode;