diff options
| author | marha <marha@users.sourceforge.net> | 2010-06-11 14:16:16 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-06-11 14:16:16 +0000 |
| commit | d1e4f4b8546c7955c66dd023bfd6ef437db9d21d (patch) | |
| tree | 529985e77bfc95aa95fe5b540e8f42b0ef041206 /xorg-server/include/xkbsrv.h | |
| parent | 13919cf85a6ca41d97238de13344aba59e0f7680 (diff) | |
| parent | 4c61bf84b11e26e6f22648668c95ea760a379163 (diff) | |
| download | vcxsrv-d1e4f4b8546c7955c66dd023bfd6ef437db9d21d.tar.gz vcxsrv-d1e4f4b8546c7955c66dd023bfd6ef437db9d21d.tar.bz2 vcxsrv-d1e4f4b8546c7955c66dd023bfd6ef437db9d21d.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/include/xkbsrv.h')
| -rw-r--r-- | xorg-server/include/xkbsrv.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/xorg-server/include/xkbsrv.h b/xorg-server/include/xkbsrv.h index 7a93ccfcd..2648ff51a 100644 --- a/xorg-server/include/xkbsrv.h +++ b/xorg-server/include/xkbsrv.h @@ -275,7 +275,9 @@ typedef struct device->public.realInputProc = oldprocs->realInputProc; \
device->unwrapProc = oldprocs->unwrapProc;
-extern DevPrivateKey xkbDevicePrivateKey;
+extern _X_EXPORT DevPrivateKeyRec xkbDevicePrivateKeyRec;
+#define xkbDevicePrivateKey (&xkbDevicePrivateKeyRec)
+
#define XKBDEVICEINFO(dev) ((xkbDeviceInfoPtr)dixLookupPrivate(&(dev)->devPrivates, xkbDevicePrivateKey))
extern void xkbUnwrapProc(DeviceIntPtr, DeviceHandleProc, pointer);
@@ -319,6 +321,8 @@ extern _X_EXPORT int XkbProcessArguments( int /* i */
);
+extern _X_EXPORT Bool XkbInitPrivates(void);
+
extern _X_EXPORT void XkbSetExtension(DeviceIntPtr device, ProcessInputProc proc);
extern _X_EXPORT void XkbFreeCompatMap(
|