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 /src | |
| 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 'src')
| -rw-r--r-- | src/gdisp/gdisp.c | 12 | ||||
| -rw-r--r-- | src/gwin/gwin_options.h | 2 |
2 files changed, 1 insertions, 13 deletions
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 diff --git a/src/gwin/gwin_options.h b/src/gwin/gwin_options.h index 45dfcd36..ab3e284a 100644 --- a/src/gwin/gwin_options.h +++ b/src/gwin/gwin_options.h @@ -28,7 +28,7 @@ * @details Defaults to FALSE */ #ifndef GWIN_NEED_WINDOWMANAGER - #define GWIN_NEED_WIDGET FALSE + #define GWIN_NEED_WINDOWMANAGER FALSE #endif /** * @brief Should the widget hierarchy be included. This provides parent-child features. |