summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChase Douglas <chase.douglas@canonical.com>2011-02-14 16:31:20 +0100
committerHenrik Rydberg <rydberg@euromail.se>2011-03-14 12:55:19 +0100
commitcc789849bf165a19aa3a8b3270c9c2259e2d368c (patch)
tree16800b2d34623f69d6b6cfafb410e22d631d8717
parentafc412d5c5567438a9a9a806b2f12dbd377bd38b (diff)
Small compilation warning fixes
Found by using -Wall -Werror Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
-rw-r--r--src/grail-api.c4
-rw-r--r--tools/grail-gesture.c1
2 files changed, 2 insertions, 3 deletions
diff --git a/src/grail-api.c b/src/grail-api.c
index 3aca75d..a584e23 100644
--- a/src/grail-api.c
+++ b/src/grail-api.c
@@ -29,6 +29,7 @@
29#include <fcntl.h> 29#include <fcntl.h>
30#include <malloc.h> 30#include <malloc.h>
31#include <errno.h> 31#include <errno.h>
32#include <stdlib.h>
32 33
33#define DIM_FRAMES 100 34#define DIM_FRAMES 100
34#define FRAME_RATE 100 35#define FRAME_RATE 100
@@ -41,8 +42,6 @@ void grail_filter_abs_events(struct grail *ge, int usage)
41 42
42static void init_impl(struct grail_impl *x) 43static void init_impl(struct grail_impl *x)
43{ 44{
44 int i;
45
46 if (evemu_has_event(x->evemu, EV_ABS, ABS_X)) { 45 if (evemu_has_event(x->evemu, EV_ABS, ABS_X)) {
47 x->emin_x = evemu_get_abs_minimum(x->evemu, ABS_X); 46 x->emin_x = evemu_get_abs_minimum(x->evemu, ABS_X);
48 x->emin_y = evemu_get_abs_minimum(x->evemu, ABS_Y); 47 x->emin_y = evemu_get_abs_minimum(x->evemu, ABS_Y);
@@ -120,7 +119,6 @@ int grail_open(struct grail *ge, int fd)
120void grail_close(struct grail *ge, int fd) 119void grail_close(struct grail *ge, int fd)
121{ 120{
122 struct grail_impl *x = ge->impl; 121 struct grail_impl *x = ge->impl;
123 void *status;
124 gru_destroy(ge); 122 gru_destroy(ge);
125 gin_destroy(ge); 123 gin_destroy(ge);
126 utouch_frame_delete_engine(x->fh); 124 utouch_frame_delete_engine(x->fh);
diff --git a/tools/grail-gesture.c b/tools/grail-gesture.c
index 614bf1a..368150e 100644
--- a/tools/grail-gesture.c
+++ b/tools/grail-gesture.c
@@ -27,6 +27,7 @@
27#include <stdio.h> 27#include <stdio.h>
28#include <unistd.h> 28#include <unistd.h>
29#include <fcntl.h> 29#include <fcntl.h>
30#include <stdlib.h>
30 31
31static grail_mask_t flag_mask[DIM_GRAIL_TYPE_BYTES]; 32static grail_mask_t flag_mask[DIM_GRAIL_TYPE_BYTES];
32 33