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

Revert the use of the new compiler defines as they are not autodetected correctly yet

ugfx_release_2.6
inmarket 2015-11-11 19:15:30 +10:00
parent 54b76a7568
commit 2efd207660
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gfx.h
View File

@ -57,7 +57,7 @@
#if GFX_NO_INLINE #if GFX_NO_INLINE
#define GFXINLINE #define GFXINLINE
#else #else
#if (GFX_COMPILER == GFX_COMPILER_ARMCC) || (GFX_COMPILER == GFX_COMPILER_KEIL) #if defined(__KEIL__) || defined(__C51__)
#define GFXINLINE __inline #define GFXINLINE __inline
#else #else
#define GFXINLINE inline #define GFXINLINE inline

4
src/gos/gos_x_threads.c
View File

@ -203,12 +203,12 @@ static thread mainthread; // The main thread context
* 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(setjmp) && !defined(_setjmp)) || (GFX_COMPILER == GFX_COMPILER_ARMCC) || (GFX_COMPILER == GFX_COMPILER_KEIL) #if (!defined(setjmp) && !defined(_setjmp)) || defined(__KEIL__) || defined(__C51__)
#define CXT_SAVE setjmp #define CXT_SAVE setjmp
#else #else
#define CXT_SAVE _setjmp #define CXT_SAVE _setjmp
#endif #endif
#if (!defined(longjmp) && !defined(_longjmp)) || (GFX_COMPILER == GFX_COMPILER_ARMCC) || (GFX_COMPILER == GFX_COMPILER_KEIL) #if (!defined(longjmp) && !defined(_longjmp)) || defined(__KEIL__) || defined(__C51__)
#define CXT_RESTORE longjmp #define CXT_RESTORE longjmp
#else #else
#define CXT_RESTORE _longjmp #define CXT_RESTORE _longjmp