From fd7e047bf80720cc5dc2801955a74b425942102c Mon Sep 17 00:00:00 2001
From: Joel Bodenmann <joel@seriouslyembedded.com>
Date: Tue, 20 Oct 2015 20:00:45 +0200
Subject: [PATCH] Moving INLINE macro to gfx.h main file as inlined functions
 are also used outside of gdisp.h

---
 gfx.h             | 12 ++++++++++++
 src/gdisp/gdisp.c | 12 ------------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/gfx.h b/gfx.h
index 2d073c0c..21d5dbb1 100644
--- a/gfx.h
+++ b/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"
 
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