From 611febab5a51979543f74daa8cc1537745b3e00b Mon Sep 17 00:00:00 2001
From: Ryan Pavlik <ryan.pavlik@collabora.com>
Date: Mon, 8 Apr 2019 14:19:02 -0500
Subject: [PATCH] st/oxr: Switch logger to using XRT_DEBUGBREAK

---
 src/xrt/state_trackers/oxr/oxr_logger.cpp | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/xrt/state_trackers/oxr/oxr_logger.cpp b/src/xrt/state_trackers/oxr/oxr_logger.cpp
index eee1f1c32..d94a314a2 100644
--- a/src/xrt/state_trackers/oxr/oxr_logger.cpp
+++ b/src/xrt/state_trackers/oxr/oxr_logger.cpp
@@ -16,10 +16,6 @@
 #include "oxr_objects.h"
 #include "oxr_logger.h"
 
-#ifdef _MSC_VER
-// needed for __debugbreak()
-#include <intrin.h>
-#endif // _MSC_VER
 
 DEBUG_GET_ONCE_BOOL_OPTION(entrypoints, "OXR_DEBUG_ENTRYPOINTS", false)
 DEBUG_GET_ONCE_BOOL_OPTION(break_on_error, "OXR_BREAK_ON_ERROR", false)
@@ -98,12 +94,8 @@ oxr_error(struct oxr_logger *logger, XrResult result, const char *fmt, ...)
 
 	fprintf(stderr, "\n");
 	if (debug_get_bool_option_break_on_error()) {
-/// Trigger a debugger breakpoint.
-#ifdef _MSC_VER
-		__debugbreak();
-#else
-		__builtin_trap();
-#endif
+		/// Trigger a debugger breakpoint.
+		XRT_DEBUGBREAK();
 	}
 
 	return result;