Browse Source

Merge pull request #135 from dwimsey/debugbreak-fix

Use builtin debug break functions
David Wimsey 11 years ago
parent
commit
0f039b4f1d
1 changed files with 7 additions and 11 deletions
  1. 7 11
      Include/Rocket/Core/Debug.h

+ 7 - 11
Include/Rocket/Core/Debug.h

@@ -33,24 +33,20 @@
 // Define for breakpointing.
 #if defined (ROCKET_PLATFORM_WIN32)
 	#if defined (__MINGW32__)
-		#define ROCKET_BREAK asm("int $0x03")
+		#define ROCKET_BREAK {asm("int $0x03");}
+	#elif defined (_MSC_VER)
+		#define ROCKET_BREAK {__debugbreak();}
 	#else
-		#define ROCKET_BREAK __debugbreak();
+		#define ROCKET_BREAK
 	#endif
 #elif defined (ROCKET_PLATFORM_LINUX)
-	#if defined __i386__ || defined __x86_64__
-		#define ROCKET_BREAK asm ("int $0x03" )
+	#if defined __GNUC__
+		#define ROCKET_BREAK {__builtin_trap();}
 	#else
 		#define ROCKET_BREAK
 	#endif
 #elif defined (ROCKET_PLATFORM_MACOSX)
-	#include <TargetConditionals.h>
-
-	#if TARGET_OS_IPHONE
-		#define ROCKET_BREAK
-	#else
-		#define ROCKET_BREAK {__asm__("int $3\n" : : );}
-	#endif
+	#define ROCKET_BREAK {__builtin_trap();}
 #endif