From 060e479b934e701aca0cdbe73d5ead83c30c995f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 6 Apr 2014 13:51:19 +0200 Subject: [PATCH] Safer use of defines in logging.h --- base/logging.h | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/base/logging.h b/base/logging.h index fd876f5d7b..0e0e2e8129 100644 --- a/base/logging.h +++ b/base/logging.h @@ -29,18 +29,17 @@ inline void Crash() { __asm { int 3 }; } #else -#if defined(ARM) || defined(MIPS) +#if defined(_M_IX86) || defined(_M_X64) +inline void Crash() { + PrintBacktraceToStderr(); + asm("int $0x3"); +} +#else inline void Crash() { PrintBacktraceToStderr(); char *p = (char *)1337; *p = 1; } -#else -// TODO: 64-bit version -inline void Crash() { - PrintBacktraceToStderr(); - asm("int $0x3"); -} #endif #endif