diff options
author | Joel Bodenmann <joel@seriouslyembedded.com> | 2015-10-20 20:09:12 +0200 |
---|---|---|
committer | Joel Bodenmann <joel@seriouslyembedded.com> | 2015-10-20 20:09:12 +0200 |
commit | 9a1d2e43e50da99b924b281e91c03a7e96b02b73 (patch) | |
tree | 96ddd2ccb21e40f7b212840709db131e5ad1ae15 | |
parent | dcd8e588fcc56f2cedfea386892a26f3ead955aa (diff) | |
parent | 1092f7c2824d4e4d01815a9f2f81f9514c8731ea (diff) | |
download | uGFX-9a1d2e43e50da99b924b281e91c03a7e96b02b73.tar.gz uGFX-9a1d2e43e50da99b924b281e91c03a7e96b02b73.tar.bz2 uGFX-9a1d2e43e50da99b924b281e91c03a7e96b02b73.zip |
Merge branch 'master' into Keil
-rw-r--r-- | gfx.h | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -55,9 +55,9 @@ * __inline was standardized with C99. previous to that each compiler handles it differently. */ #undef INLINE -#ifdef(__KEIL__) +#ifdef __KEIL__ #define INLINE __inline -#elif(__C51__) +#elif __C51__ #define INLINE __inline #else #define INLINE inline |