Merge branch 'master' into Keil

ugfx_release_2.6
Joel Bodenmann 2015-10-20 20:09:12 +02:00
commit 9a1d2e43e5
1 changed files with 2 additions and 2 deletions

4
gfx.h
View File

@ -55,9 +55,9 @@
* __inline was standardized with C99. previous to that each compiler handles it differently. * __inline was standardized with C99. previous to that each compiler handles it differently.
*/ */
#undef INLINE #undef INLINE
#ifdef(__KEIL__) #ifdef __KEIL__
#define INLINE __inline #define INLINE __inline
#elif(__C51__) #elif __C51__
#define INLINE __inline #define INLINE __inline
#else #else
#define INLINE inline #define INLINE inline