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

Adding GFX_COMPILER_ARMCC and GFX_COMPILER_KEIL

Browse source
This commit is contained in:
Joel Bodenmann 2015-11-07 16:54:10 +01:00
parent 6397a56e0b
commit ff01cc0212
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gfx.h
View file

@ -35,7 +35,12 @@
* @brief Generic 'true' boolean constant. * @brief Generic 'true' boolean constant.
*/ */
#if !defined(TRUE) || defined(__DOXYGEN__) #if !defined(TRUE) || defined(__DOXYGEN__)
#define TRUE -1 // Keil/ARMCC requires some special threatment. can probably be generalized to always be 1.
#if (GFX_COMPILER == GFX_COMPILER_ARMCC) || (GFX_COMPILER == GFX_COMPILER_KEIL)
#define TRUE 1
#else
#define TRUE -1
#endif
#endif #endif
/** /**
@ -57,7 +62,7 @@
#if GFX_NO_INLINE #if GFX_NO_INLINE
#define GFXINLINE #define GFXINLINE
#else #else
#if defined(__KEIL__) || defined(__C51__) #if (GFX_COMPILER == GFX_COMPILER_ARMCC) || (GFX_COMPILER == GFX_COMPILER_KEIL)
#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)) || defined(__KEIL__) || defined(__C51__) #if (!defined(setjmp) && !defined(_setjmp)) || (GFX_COMPILER == GFX_COMPILER_ARMCC) || (GFX_COMPILER == GFX_COMPILER_KEIL)
#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)) || defined(__KEIL__) || defined(__C51__) #if (!defined(longjmp) && !defined(_longjmp)) || (GFX_COMPILER == GFX_COMPILER_ARMCC) || (GFX_COMPILER == GFX_COMPILER_KEIL)
#define CXT_RESTORE longjmp #define CXT_RESTORE longjmp
#else #else
#define CXT_RESTORE _longjmp #define CXT_RESTORE _longjmp

2
src/gwin/gwin_class.h
View file

@ -23,7 +23,7 @@
#if GFX_USE_GWIN || defined(__DOXYGEN__) #if GFX_USE_GWIN || defined(__DOXYGEN__)
#if defined(__KEIL__) || defined(__C51__) #if (GFX_COMPILER == GFX_COMPILER_ARMCC) || (GFX_COMPILER == GFX_COMPILER_KEIL)
#pragma anon_unions #pragma anon_unions
#endif #endif