diff options
| author | Joel Bodenmann <joel@seriouslyembedded.com> | 2015-11-07 16:54:10 +0100 |
|---|---|---|
| committer | Joel Bodenmann <joel@seriouslyembedded.com> | 2015-11-07 16:54:10 +0100 |
| commit | ff01cc0212c951a2613f7ca5fb1e9579f17299cb (patch) | |
| tree | 78bd97c1cf904f50da5d1694f1f8f788ec3594b3 /src | |
| parent | 6397a56e0beddf179786e093b08bcf0cbe71fea1 (diff) | |
| download | uGFX-ff01cc0212c951a2613f7ca5fb1e9579f17299cb.tar.gz uGFX-ff01cc0212c951a2613f7ca5fb1e9579f17299cb.tar.bz2 uGFX-ff01cc0212c951a2613f7ca5fb1e9579f17299cb.zip | |
Adding GFX_COMPILER_ARMCC and GFX_COMPILER_KEIL
Diffstat (limited to 'src')
| -rw-r--r-- | src/gos/gos_x_threads.c | 4 | ||||
| -rw-r--r-- | src/gwin/gwin_class.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/gos/gos_x_threads.c b/src/gos/gos_x_threads.c index 8a781b21..ea6e1852 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)) || defined(__KEIL__) || defined(__C51__) + #if (!defined(setjmp) && !defined(_setjmp)) || (GFX_COMPILER == GFX_COMPILER_ARMCC) || (GFX_COMPILER == GFX_COMPILER_KEIL) #define CXT_SAVE setjmp #else #define CXT_SAVE _setjmp #endif - #if (!defined(longjmp) && !defined(_longjmp)) || defined(__KEIL__) || defined(__C51__) + #if (!defined(longjmp) && !defined(_longjmp)) || (GFX_COMPILER == GFX_COMPILER_ARMCC) || (GFX_COMPILER == GFX_COMPILER_KEIL) #define CXT_RESTORE longjmp #else #define CXT_RESTORE _longjmp diff --git a/src/gwin/gwin_class.h b/src/gwin/gwin_class.h index 7946a839..6a3f62b4 100644 --- a/src/gwin/gwin_class.h +++ b/src/gwin/gwin_class.h @@ -23,7 +23,7 @@ #if GFX_USE_GWIN || defined(__DOXYGEN__) -#if defined(__KEIL__) || defined(__C51__) +#if (GFX_COMPILER == GFX_COMPILER_ARMCC) || (GFX_COMPILER == GFX_COMPILER_KEIL) #pragma anon_unions #endif |