aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/gdisp/gdisp.c12
-rw-r--r--src/gwin/gwin_options.h2
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.