diff options
| author | Joel Bodenmann <joel@seriouslyembedded.com> | 2015-10-20 20:01:41 +0200 |
|---|---|---|
| committer | Joel Bodenmann <joel@seriouslyembedded.com> | 2015-10-20 20:01:41 +0200 |
| commit | 592ee0f312c0009dccbdabf2a2736bf329434345 (patch) | |
| tree | 49d502d4ca9cb631923d8a3437d43af7c1b56af6 /gfx.h | |
| parent | fbe7df300857bf3c327342f14316e59ba6c99e04 (diff) | |
| parent | fd7e047bf80720cc5dc2801955a74b425942102c (diff) | |
| download | uGFX-592ee0f312c0009dccbdabf2a2736bf329434345.tar.gz uGFX-592ee0f312c0009dccbdabf2a2736bf329434345.tar.bz2 uGFX-592ee0f312c0009dccbdabf2a2736bf329434345.zip | |
Merge branch 'master' into Keil
Diffstat (limited to 'gfx.h')
| -rw-r--r-- | gfx.h | 12 |
1 files changed, 12 insertions, 0 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" |