diff options
| author | marha <marha@users.sourceforge.net> | 2014-08-30 13:45:43 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-08-30 13:45:43 +0200 |
| commit | 3293021e6f582c7348667e7638941620134525e1 (patch) | |
| tree | 5d8d3da8242ff7828fb6964bed19b13d74d48704 /xorg-server/hw/xfree86/common/xf86Xinput.h | |
| parent | 0a9ab140bb01b96888e313466a73e26e5156f22d (diff) | |
| parent | e21655632e3fd40b7f6a5cc3c7f3c379d54557c4 (diff) | |
| download | vcxsrv-3293021e6f582c7348667e7638941620134525e1.tar.gz vcxsrv-3293021e6f582c7348667e7638941620134525e1.tar.bz2 vcxsrv-3293021e6f582c7348667e7638941620134525e1.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/hw/kdrive/ephyr/ephyrinit.c
Diffstat (limited to 'xorg-server/hw/xfree86/common/xf86Xinput.h')
| -rw-r--r-- | xorg-server/hw/xfree86/common/xf86Xinput.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/xorg-server/hw/xfree86/common/xf86Xinput.h b/xorg-server/hw/xfree86/common/xf86Xinput.h index 9fe8c87b6..66a64fb48 100644 --- a/xorg-server/hw/xfree86/common/xf86Xinput.h +++ b/xorg-server/hw/xfree86/common/xf86Xinput.h @@ -51,6 +51,7 @@ #ifndef _xf86Xinput_h #define _xf86Xinput_h +#include "xf86.h" #include "xf86str.h" #include "inputstr.h" #include <X11/extensions/XI.h> @@ -85,7 +86,7 @@ typedef struct _InputDriverRec { /* This is to input devices what the ScrnInfoRec is to screens. */ -typedef struct _InputInfoRec { +struct _InputInfoRec { struct _InputInfoRec *next; char *name; char *driver; @@ -110,7 +111,7 @@ typedef struct _InputInfoRec { void *module; XF86OptionPtr options; InputAttributes *attrs; -} *InputInfoPtr; +}; /* xf86Globals.c */ extern InputInfoPtr xf86InputDevs; |