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

Fix compiler detection for Keil uVision V5

ugfx_release_2.6
inmarket 2015-11-12 18:43:20 +10:00
parent d403294cb4
commit 849369ccec
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gfx.h
View File

@ -286,7 +286,7 @@
#define GFX_COMPILER GFX_COMPILER_MINGW64 #define GFX_COMPILER GFX_COMPILER_MINGW64
#elif defined(__CYGWIN__) #elif defined(__CYGWIN__)
#define GFX_COMPILER GFX_COMPILER_CYGWIN #define GFX_COMPILER GFX_COMPILER_CYGWIN
#elif defined(__KEIL__) || defined(__C51__) #elif defined(__KEIL__) || defined(__C51__) || (defined(__CC_ARM) && defined(__EDG__))
#define GFX_COMPILER GFX_COMPILER_KEIL #define GFX_COMPILER GFX_COMPILER_KEIL
#elif defined(__clang__) #elif defined(__clang__)
#define GFX_COMPILER GFX_COMPILER_CLANG #define GFX_COMPILER GFX_COMPILER_CLANG
@ -392,7 +392,7 @@
#if GFX_NO_INLINE #if GFX_NO_INLINE
#define GFXINLINE #define GFXINLINE
#else #else
#if defined(__KEIL__) || defined(__C51__) #if GFX_COMPILER == GFX_COMILER_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_COMILER_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_COMILER_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_COMILER_KEIL
#pragma anon_unions #pragma anon_unions
#endif #endif