aboutsummaryrefslogtreecommitdiffstats
path: root/src/gos/gos_raw32.c
diff options
context:
space:
mode:
authorinmarket <andrewh@inmarket.com.au>2015-03-18 10:26:35 +1000
committerinmarket <andrewh@inmarket.com.au>2015-03-18 10:26:35 +1000
commitfe20965c3f465b4530da870dc1b248b23f229066 (patch)
tree0eca4ea61711c1ba28bb831056a8d24a4e7c3f4d /src/gos/gos_raw32.c
parent1caabc3f75ae2566c00d1ad1df53d15d9d4b685b (diff)
downloaduGFX-fe20965c3f465b4530da870dc1b248b23f229066.tar.gz
uGFX-fe20965c3f465b4530da870dc1b248b23f229066.tar.bz2
uGFX-fe20965c3f465b4530da870dc1b248b23f229066.zip
More updates for Keil with raw32 GOS.
Diffstat (limited to 'src/gos/gos_raw32.c')
-rw-r--r--src/gos/gos_raw32.c16
1 files changed, 5 insertions, 11 deletions
diff --git a/src/gos/gos_raw32.c b/src/gos/gos_raw32.c
index 9953090a..dabbe910 100644
--- a/src/gos/gos_raw32.c
+++ b/src/gos/gos_raw32.c
@@ -460,17 +460,11 @@ void gfxSleepMicroseconds(delaytime_t ms) {
* If they don't exist compile them to be the standard setjmp() function.
* Similarly for longjmp().
*/
-#if !defined(__KEIL__) && !defined(__C51__)
- #ifndef setjmp
- #ifndef _setjmp
- #define _setjmp setjmp
- #endif
- #endif
- #ifndef longjmp
- #ifndef _longjmp
- #define _longjmp longjmp
- #endif
- #endif
+#if (!defined(setjmp) && !defined(_setjmp)) || defined(__KIEL__) || defined(__C51__)
+ #define _setjmp setjmp
+#endif
+#if (!defined(longjmp) && !defined(_longjmp)) || defined(__KIEL__) || defined(__C51__)
+ #define _longjmp longjmp
#endif
typedef struct thread {