summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorColin Hill <colin.james.hill@gmail.com>2011-02-01 13:41:19 -0800
committerColin Hill <colin.james.hill@gmail.com>2011-02-01 13:41:19 -0800
commita76bed2e77189ec71e31a7d7cfdf2e243db152ce (patch)
tree39490470bd48b569bc7577dad62d3995a6ac5b1a /src
parente6b615531a947b36d3780acba98a7d08b14e80d7 (diff)
Fixed various compile warnings in xNestedMouse.c
Diffstat (limited to 'src')
-rw-r--r--src/xNestedMouse.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/xNestedMouse.c b/src/xNestedMouse.c
index 3e48518..0cdb09b 100644
--- a/src/xNestedMouse.c
+++ b/src/xNestedMouse.c
@@ -1,6 +1,7 @@
#include <fcntl.h>
+#include <stdlib.h>
#include <string.h>
-#include <string.h>
+#include <unistd.h>
#include <xorg/xorg-server.h>
#include <xorg/fb.h>
@@ -113,7 +114,6 @@ NestedMousePreInit(InputDriverPtr drv, IDevPtr dev, int flags) {
return pInfo;
}
-
static void
NestedMouseUnInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags) {
}
@@ -122,20 +122,20 @@ static pointer
NestedMousePlug(pointer module, pointer options, int *errmaj, int *errmin) {
xf86AddInputDriver(&NESTEDMOUSE, module, 0);
return module;
-};
+}
static void
NestedMouseUnplug(pointer p) {
-};
+}
static int
_nested_mouse_init_buttons(DeviceIntPtr device) {
- return NULL;
+ return -1;
}
static int
_nested_mouse_init_axes(DeviceIntPtr device) {
- return NULL;
+ return -1;
}
static int
@@ -168,6 +168,7 @@ NestedMouseControl(DeviceIntPtr device, int what) {
/* free what we have to free */
break;
}
+
return Success;
}