Moving INLINE macro to gfx.h main file as inlined functions are also used outside of gdisp.h
This commit is contained in:
parent
56794c2eb9
commit
fd7e047bf8
2 changed files with 12 additions and 12 deletions
12
gfx.h
12
gfx.h
|
@ -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"
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Reference in a new issue