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

Revert "INLINE -> inline"

Browse source 
This reverts commit d4c4740bcf.
This commit is contained in:
inmarket 2013-11-30 11:00:49 +10:00
parent d4c4740bcf
commit cec125a53b
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/gdisp/gdisp.c
View file

@ -20,11 +20,11 @@
#include "gdisp/lld/gdisp_lld.h" #include "gdisp/lld/gdisp_lld.h"
#if 1 #if 1
#undef inline #undef INLINE
#define inline inline #define INLINE inline
#else #else
#undef inline #undef INLINE
#define inline #define INLINE
#endif #endif
// Number of milliseconds for the startup logo - 0 means disabled. // Number of milliseconds for the startup logo - 0 means disabled.
@ -89,7 +89,7 @@ GDisplay *GDISP = GDisplayArray;
/*==========================================================================*/ /*==========================================================================*/
#if GDISP_HARDWARE_STREAM_POS && GDISP_HARDWARE_STREAM_WRITE #if GDISP_HARDWARE_STREAM_POS && GDISP_HARDWARE_STREAM_WRITE
static inline void setglobalwindow(GDisplay *g) { static INLINE void setglobalwindow(GDisplay *g) {
coord_t x, y; coord_t x, y;
x = g->p.x; y = g->p.y; x = g->p.x; y = g->p.y;
g->p.x = g->p.y = 0; g->p.x = g->p.y = 0;
@ -125,7 +125,7 @@ GDisplay *GDISP = GDisplayArray;
// Parameters: x,y // Parameters: x,y
// Alters: cx, cy (if using streaming) // Alters: cx, cy (if using streaming)
// Does not clip // Does not clip
static inline void drawpixel(GDisplay *g) { static INLINE void drawpixel(GDisplay *g) {
// Best is hardware accelerated pixel draw // Best is hardware accelerated pixel draw
#if GDISP_HARDWARE_DRAWPIXEL #if GDISP_HARDWARE_DRAWPIXEL
@ -172,7 +172,7 @@ static inline void drawpixel(GDisplay *g) {
// Parameters: x,y // Parameters: x,y
// Alters: cx, cy (if using streaming) // Alters: cx, cy (if using streaming)
#if NEED_CLIPPING #if NEED_CLIPPING
static inline void drawpixel_clip(GDisplay *g) { static INLINE void drawpixel_clip(GDisplay *g) {
#if GDISP_HARDWARE_CLIP == HARDWARE_AUTODETECT #if GDISP_HARDWARE_CLIP == HARDWARE_AUTODETECT
if (!g->vmt->setclip) if (!g->vmt->setclip)
#endif #endif
@ -191,7 +191,7 @@ static inline void drawpixel(GDisplay *g) {
// Alters: nothing // Alters: nothing
// Note: This is not clipped // Note: This is not clipped
// Resets the streaming area if GDISP_HARDWARE_STREAM_WRITE and GDISP_HARDWARE_STREAM_POS is set. // Resets the streaming area if GDISP_HARDWARE_STREAM_WRITE and GDISP_HARDWARE_STREAM_POS is set.
static inline void fillarea(GDisplay *g) { static INLINE void fillarea(GDisplay *g) {
// Best is hardware accelerated area fill // Best is hardware accelerated area fill
#if GDISP_HARDWARE_FILLS #if GDISP_HARDWARE_FILLS