diff options
author | Colin Hill <colin.james.hill@gmail.com> | 2011-02-08 13:50:45 -0800 |
---|---|---|
committer | Colin Hill <colin.james.hill@gmail.com> | 2011-02-08 13:50:45 -0800 |
commit | 4610d6d94f38745f9755b6df43d45619f337e4d5 (patch) | |
tree | 426ecac6a46bda87827bfa06991c2e9089c7c57d | |
parent | f9ac7bd0e20eafc394260be38789dfcbff99db68 (diff) |
Moved some delcarations from xNestedMouse.h to xNestedMouse.c
-rw-r--r-- | src/xNestedMouse.c | 11 | ||||
-rw-r--r-- | 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); |