aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--gfx.h2
-rw-r--r--src/gos/gos_x_threads.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/gfx.h b/gfx.h
index 698fbdee..48a92770 100644
--- a/gfx.h
+++ b/gfx.h
@@ -57,7 +57,7 @@
#if GFX_NO_INLINE
#define GFXINLINE
#else
- #if (GFX_COMPILER == GFX_COMPILER_ARMCC) || (GFX_COMPILER == GFX_COMPILER_KEIL)
+ #if defined(__KEIL__) || defined(__C51__)
#define GFXINLINE __inline
#else
#define GFXINLINE inline
diff --git a/src/gos/gos_x_threads.c b/src/gos/gos_x_threads.c
index ea6e1852..8a781b21 100644
--- a/src/gos/gos_x_threads.c
+++ b/src/gos/gos_x_threads.c
@@ -203,12 +203,12 @@ static thread mainthread; // The main thread context
* If they don't exist compile them to be the standard setjmp() function.
* Similarly for longjmp().
*/
- #if (!defined(setjmp) && !defined(_setjmp)) || (GFX_COMPILER == GFX_COMPILER_ARMCC) || (GFX_COMPILER == GFX_COMPILER_KEIL)
+ #if (!defined(setjmp) && !defined(_setjmp)) || defined(__KEIL__) || defined(__C51__)
#define CXT_SAVE setjmp
#else
#define CXT_SAVE _setjmp
#endif
- #if (!defined(longjmp) && !defined(_longjmp)) || (GFX_COMPILER == GFX_COMPILER_ARMCC) || (GFX_COMPILER == GFX_COMPILER_KEIL)
+ #if (!defined(longjmp) && !defined(_longjmp)) || defined(__KEIL__) || defined(__C51__)
#define CXT_RESTORE longjmp
#else
#define CXT_RESTORE _longjmp