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

Moving INLINE macro to gfx.h main file as inlined functions are also used outside of gdisp.h

Browse source
This commit is contained in:
Joel Bodenmann 2015-10-20 20:00:45 +02:00
parent 56794c2eb9
commit fd7e047bf8
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gfx.h
View file

@ -51,6 +51,18 @@
#endif #endif
#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. */ /* gfxconf.h is the user's project configuration for the GFX system. */
#include "gfxconf.h" #include "gfxconf.h"

12
src/gdisp/gdisp.c
View file

@ -12,18 +12,6 @@
/* Include the low level driver information */ /* Include the low level driver information */
#include "gdisp_driver.h" #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. // Number of milliseconds for the startup logo - 0 means disabled.
#if GDISP_NEED_STARTUP_LOGO #if GDISP_NEED_STARTUP_LOGO
#define GDISP_STARTUP_LOGO_TIMEOUT 1000 #define GDISP_STARTUP_LOGO_TIMEOUT 1000