diff options
| author | marha <marha@users.sourceforge.net> | 2014-03-28 17:43:20 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-03-28 17:43:20 +0100 |
| commit | f0f09f4aa3cdd0267f58b362a7c9fc5ae0921afd (patch) | |
| tree | afbeb028495328a2817aedbac7aae484a2c71a83 /xorg-server/include/xkbsrv.h | |
| parent | bf0cbcc1d00962ef2221cb4ceae87cc5ae737454 (diff) | |
| parent | cbfb19790917d271b8ca6156554b16acc802719f (diff) | |
| download | vcxsrv-f0f09f4aa3cdd0267f58b362a7c9fc5ae0921afd.tar.gz vcxsrv-f0f09f4aa3cdd0267f58b362a7c9fc5ae0921afd.tar.bz2 vcxsrv-f0f09f4aa3cdd0267f58b362a7c9fc5ae0921afd.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
X11/xtrans/Xtrans.c
Diffstat (limited to 'xorg-server/include/xkbsrv.h')
| -rw-r--r-- | xorg-server/include/xkbsrv.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/xorg-server/include/xkbsrv.h b/xorg-server/include/xkbsrv.h index ae43889e7..a1bb62110 100644 --- a/xorg-server/include/xkbsrv.h +++ b/xorg-server/include/xkbsrv.h @@ -824,6 +824,9 @@ extern _X_EXPORT void XkbSendNewKeyboardNotify(DeviceIntPtr /* kbd */ , extern Bool XkbCopyKeymap(XkbDescPtr /* dst */ , XkbDescPtr /* src */ ); +extern _X_EXPORT Bool XkbCopyDeviceKeymap(DeviceIntPtr /* dst */, + DeviceIntPtr /* src */); + extern _X_EXPORT Bool XkbDeviceApplyKeymap(DeviceIntPtr /* dst */ , XkbDescPtr /* src */ ); |