uGFX
/
ugfx
2
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

More updates for Keil with raw32 GOS.

ugfx_release_2.6
inmarket 2015-03-18 10:26:35 +10:00
parent 1caabc3f75
commit fe20965c3f
2 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/gos/gos_raw32.c
View File

@ -460,17 +460,11 @@ void gfxSleepMicroseconds(delaytime_t ms) {
* If they don't exist compile them to be the standard setjmp() function. * If they don't exist compile them to be the standard setjmp() function.
* Similarly for longjmp(). * Similarly for longjmp().
*/ */
#if !defined(__KEIL__) && !defined(__C51__) #if (!defined(setjmp) && !defined(_setjmp)) || defined(__KIEL__) || defined(__C51__)
#ifndef setjmp #define _setjmp setjmp
#ifndef _setjmp #endif
#define _setjmp setjmp #if (!defined(longjmp) && !defined(_longjmp)) || defined(__KIEL__) || defined(__C51__)
#endif #define _longjmp longjmp
#endif
#ifndef longjmp
#ifndef _longjmp
#define _longjmp longjmp
#endif
#endif
#endif #endif
typedef struct thread { typedef struct thread {

10
src/gos/gos_raw32.h
View File

@ -43,16 +43,16 @@
typedef unsigned char bool_t; typedef unsigned char bool_t;
#ifndef _STDINT_H #if !defined(_STDINT_H) && !defined(__stdint_h)
typedef char int8_t; typedef signed char int8_t;
typedef unsigned char uint8_t; typedef unsigned char uint8_t;
typedef short int16_t; typedef signed short int16_t;
typedef unsigned short uint16_t; typedef unsigned short uint16_t;
typedef int int32_t; typedef signed int int32_t;
typedef unsigned int uint32_t; typedef unsigned int uint32_t;
#endif #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; typedef uint32_t size_t;
#endif #endif