From 4610d6d94f38745f9755b6df43d45619f337e4d5 Mon Sep 17 00:00:00 2001
From: Colin Hill <colin.james.hill@gmail.com>
Date: Tue, 8 Feb 2011 13:50:45 -0800
Subject: Moved some delcarations from xNestedMouse.h to xNestedMouse.c

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

diff --git a/src/xNestedMouse.c b/src/xNestedMouse.c
index c651f02..daf4956 100644
--- a/src/xNestedMouse.c
+++ b/src/xNestedMouse.c
@@ -1,3 +1,4 @@
+#include <errno.h>
 #include <fcntl.h>
 #include <stdlib.h>
 #include <string.h>
@@ -19,6 +20,8 @@
 
 #include "xNestedMouse.h"
 
+#define SYSCALL(call) while (((call) == -1) && (errno == EINTR))
+
 static InputInfoPtr NestedMousePreInit(InputDriverPtr drv, IDevPtr dev, int flags);
 static void NestedMouseUnInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags);
 static pointer NestedMousePlug(pointer module, pointer options, int *errmaj, int  *errmin);
@@ -38,6 +41,14 @@ _X_EXPORT InputDriverRec NESTEDMOUSE = {
     0,
 };
 
+typedef struct _NestedMouseDeviceRec {
+    char *device;
+    int version;        /* Driver version */
+    Atom* labels;
+    int num_vals;
+    int axes;
+} NestedMouseDeviceRec, *NestedMouseDevicePtr;
+
 static XF86ModuleVersionInfo NestedMouseVersionRec = {
     "nestedmouse",
     MODULEVENDORSTRING,
diff --git a/src/xNestedMouse.h b/src/xNestedMouse.h
index d586a36..53d4ad5 100644
--- a/src/xNestedMouse.h
+++ b/src/xNestedMouse.h
@@ -1,13 +1 @@
-#include <errno.h>
-
-#define SYSCALL(call) while (((call) == -1) && (errno == EINTR))
-
-typedef struct _NestedMouseDeviceRec {
-    char *device;
-    int version;        /* Driver version */
-    Atom* labels;
-    int num_vals;
-    int axes;
-} NestedMouseDeviceRec, *NestedMouseDevicePtr;
-
 void Load_Nested_Mouse(pointer module);
-- 
cgit v1.2.3