diff options
| author | Alan Hourihane <alanh@tungstengraphics.com> | 2008-02-27 17:30:21 +0000 |
|---|---|---|
| committer | Alan Hourihane <alanh@tungstengraphics.com> | 2008-02-27 17:30:21 +0000 |
| commit | 8689f7e348671f65e4b8c425ea4674fa33fc2900 (patch) | |
| tree | 55e6d0af861c23466263508d6935b05e305c4d9d /include/inputstr.h | |
| parent | 06a58f2d5363e13069315beac8934cca1aab54db (diff) | |
| parent | 41aea6194bd29ab34cc166b3fd90eee64299ddf8 (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into glucose-2
Conflicts:
hw/xfree86/Makefile.am
hw/xfree86/dri/dri.c
hw/xfree86/dri/dristruct.h
hw/xgl/glx/xglx.c
hw/xgl/xglscreen.c
render/picture.c
Diffstat (limited to 'include/inputstr.h')
| -rw-r--r-- | include/inputstr.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/inputstr.h b/include/inputstr.h index d0cc85811..6a1d5c9d7 100644 --- a/include/inputstr.h +++ b/include/inputstr.h @@ -52,6 +52,7 @@ SOFTWARE. #include "input.h" #include "window.h" #include "dixstruct.h" +#include "privates.h" #define BitIsOn(ptr, bit) (((BYTE *) (ptr))[(bit)>>3] & (1 << ((bit) & 7))) @@ -62,7 +63,7 @@ SOFTWARE. #define EMASKSIZE MAX_DEVICES -extern int CoreDevicePrivatesIndex; +extern DevPrivateKey CoreDevicePrivateKey; /* Kludge: OtherClients and InputClients must be compatible, see code */ @@ -328,7 +329,7 @@ typedef struct _DeviceIntRec { void *pad0; #endif char *config_info; /* used by the hotplug layer */ - DevUnion *devPrivates; + PrivateRec *devPrivates; int nPrivates; DeviceUnwrapProc unwrapProc; } DeviceIntRec; |