diff options
| author | inmarket <andrewh@inmarket.com.au> | 2015-11-12 18:43:20 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2015-11-12 18:43:20 +1000 |
| commit | 849369cceccfa3b9d70257306a8a93cfb852263e (patch) | |
| tree | 3bddeff9f88b994996a70c52660ba5fad6e76cb1 /src | |
| parent | d403294cb430c1dfb811880a3b8280a616c3d279 (diff) | |
| download | uGFX-849369cceccfa3b9d70257306a8a93cfb852263e.tar.gz uGFX-849369cceccfa3b9d70257306a8a93cfb852263e.tar.bz2 uGFX-849369cceccfa3b9d70257306a8a93cfb852263e.zip | |
Fix compiler detection for Keil uVision V5
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..bdb61ab9 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_COMILER_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_COMILER_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..ac89f672 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_COMILER_KEIL #pragma anon_unions #endif |