Update to GCC4.8

[clinton/Smoothieware.git] / mri / mri.h

diff --git a/mri/mri.h b/mri/mri.h
index 3e0c83d..c93b123 100644 (file)
--- a/mri/mri.h
+++ b/mri/mri.h
@@ -20,7 +20,9 @@
 #include <stdint.h>\r
 \r
 /* Used to insert hardcoded breakpoint into user's code. */\r
-#define __debugbreak()  do { __asm volatile ("bkpt #0"); } while (0)\r
+#ifndef __debugbreak\r
+    #define __debugbreak()  { __asm volatile ("bkpt #0"); }\r
+#endif\r
 \r
 /* Error strings that can be returned to GDB. */\r
 #define     MRI_ERROR_INVALID_ARGUMENT      "E01"   /* Encountered error when parsing command arguments. */\r
@@ -91,12 +93,12 @@ int __mriPlatform_CommUartIndex(void);
 \r
 #ifndef MRI_VERSION_STRING\r
 \r
-#define MRI_BRANCH "https://github.com/adamgreen/mri/tree/version_0.5"\r
+#define MRI_BRANCH "https://github.com/adamgreen/mri/tree/version_0.6"\r
 \r
 #define MRI_VERSION_MAJOR       0\r
-#define MRI_VERSION_MINOR       5\r
-#define MRI_VERSION_BUILD       20130120\r
-#define MRI_VERSION_SUBBUILD    1\r
+#define MRI_VERSION_MINOR       6\r
+#define MRI_VERSION_BUILD       20140515\r
+#define MRI_VERSION_SUBBUILD    2\r
 \r
 #define MRI_STR(X) MRI_STR2(X)\r
 #define MRI_STR2(X) #X\r