From fe20965c3f465b4530da870dc1b248b23f229066 Mon Sep 17 00:00:00 2001
From: inmarket <andrewh@inmarket.com.au>
Date: Wed, 18 Mar 2015 10:26:35 +1000
Subject: [PATCH] More updates for Keil with raw32 GOS.

---
 src/gos/gos_raw32.c | 16 +++++-----------
 src/gos/gos_raw32.h | 10 +++++-----
 2 files changed, 10 insertions(+), 16 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 {
diff --git a/src/gos/gos_raw32.h b/src/gos/gos_raw32.h
index 5a6a2aa7..158d9b19 100644
--- a/src/gos/gos_raw32.h
+++ b/src/gos/gos_raw32.h
@@ -43,16 +43,16 @@
 
 typedef unsigned char	bool_t;
 
-#ifndef _STDINT_H
-	typedef char			int8_t;
+#if !defined(_STDINT_H) && !defined(__stdint_h)
+	typedef signed char		int8_t;
 	typedef unsigned char	uint8_t;
-	typedef short			int16_t;
+	typedef signed short	int16_t;
 	typedef unsigned short	uint16_t;
-	typedef int				int32_t;
+	typedef signed int		int32_t;
 	typedef unsigned int	uint32_t;
 #endif
 
-#if !defined (__need_size_t) && !defined (_STDDEF_H_)
+#if !defined (__need_size_t) && !defined (_STDDEF_H_) && !defined(__stddef_h)
 	typedef uint32_t		size_t;
 #endif