aboutsummaryrefslogtreecommitdiffstats
path: root/src/ginput
diff options
context:
space:
mode:
authorJoel Bodenmann <joel@unormal.org>2013-03-04 23:50:21 +0100
committerJoel Bodenmann <joel@unormal.org>2013-03-04 23:50:21 +0100
commitb91e61957304aadb5af050740b89bb400f2a3983 (patch)
tree42d946f77f5f71e9de380244f04efc27e00ff593 /src/ginput
parentfa2f4b0f1931df80dd4b63a75dffe6a1b46ec2b5 (diff)
downloaduGFX-b91e61957304aadb5af050740b89bb400f2a3983.tar.gz
uGFX-b91e61957304aadb5af050740b89bb400f2a3983.tar.bz2
uGFX-b91e61957304aadb5af050740b89bb400f2a3983.zip
__inline becomes inline because most compilers dont like the prefix
Diffstat (limited to 'src/ginput')
-rw-r--r--src/ginput/mouse.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ginput/mouse.c b/src/ginput/mouse.c
index 94734888..89fc4353 100644
--- a/src/ginput/mouse.c
+++ b/src/ginput/mouse.c
@@ -88,7 +88,7 @@ static struct MouseConfig_t {
} MouseConfig;
#if GINPUT_MOUSE_NEED_CALIBRATION
- static __inline void _tsDrawCross(const MousePoint *pp) {
+ static inline void _tsDrawCross(const MousePoint *pp) {
gdispDrawLine(pp->x-15, pp->y, pp->x-2, pp->y, White);
gdispDrawLine(pp->x+2, pp->y, pp->x+15, pp->y, White);
gdispDrawLine(pp->x, pp->y-15, pp->x, pp->y-2, White);
@@ -107,16 +107,16 @@ static struct MouseConfig_t {
gdispDrawLine(pp->x+15, pp->y-15, pp->x+15, pp->y-7, RGB2COLOR(184,158,131));
}
- static __inline void _tsClearCross(const MousePoint *pp) {
+ static inline void _tsClearCross(const MousePoint *pp) {
gdispFillArea(pp->x - 15, pp->y - 15, 42, 42, Blue);
}
- static __inline void _tsTransform(MouseReading *pt, const Calibration *c) {
+ static inline void _tsTransform(MouseReading *pt, const Calibration *c) {
pt->x = (coord_t) (c->ax * pt->x + c->bx * pt->y + c->cx);
pt->y = (coord_t) (c->ay * pt->x + c->by * pt->y + c->cy);
}
- static __inline void _tsDo3PointCalibration(const MousePoint *cross, const MousePoint *points, Calibration *c) {
+ static inline void _tsDo3PointCalibration(const MousePoint *cross, const MousePoint *points, Calibration *c) {
float dx, dx0, dx1, dx2, dy0, dy1, dy2;
/* Compute all the required determinants */