diff options
| -rw-r--r-- | gfx.h | 12 | ||||
| -rw-r--r-- | src/gdisp/gdisp.c | 12 |
2 files changed, 12 insertions, 12 deletions
@@ -51,6 +51,18 @@ #endif #endif +/** + * __inline was standardized with C99. previous to that each compiler handles it differently. + */ +#undef INLINE +#ifdef(__KEIL__) + #define INLINE __inline +#elif(__C51__) + #define INLINE __inline +#else + #define INLINE inline +#endif + /* gfxconf.h is the user's project configuration for the GFX system. */ #include "gfxconf.h" diff --git a/src/gdisp/gdisp.c b/src/gdisp/gdisp.c index 0ddee1f6..27b52e92 100644 --- a/src/gdisp/gdisp.c +++ b/src/gdisp/gdisp.c @@ -12,18 +12,6 @@ /* Include the low level driver information */ #include "gdisp_driver.h" -#if 1 - #undef INLINE - #if defined(__KEIL__) || defined(__C51__) - #define INLINE __inline - #else - #define INLINE inline - #endif -#else - #undef INLINE - #define INLINE -#endif - // Number of milliseconds for the startup logo - 0 means disabled. #if GDISP_NEED_STARTUP_LOGO #define GDISP_STARTUP_LOGO_TIMEOUT 1000 |