From cd8b0d0de3fcb53f6d3ece8ce26d97aaab2c0914 Mon Sep 17 00:00:00 2001 From: marha Date: Wed, 12 Mar 2014 16:40:50 +0100 Subject: mesa xserver xkbcomp git update 12 Mar 2014 xserver commit 81a4952d3dcab9ca3a1ee399c773f5ac352036c4 xkbcomp commit d4e02a09258063c6d024c3ccd42d6b22212e6e18 mesa commit 2c886eba7820f7e3e965dd16b786b0a412d8ef11 --- xorg-server/include/systemd-logind.h | 4 ++-- xorg-server/include/xkbsrv.h | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'xorg-server/include') diff --git a/xorg-server/include/systemd-logind.h b/xorg-server/include/systemd-logind.h index 8b0908186..06dd03134 100644 --- a/xorg-server/include/systemd-logind.h +++ b/xorg-server/include/systemd-logind.h @@ -36,8 +36,8 @@ void systemd_logind_vtenter(void); #else #define systemd_logind_init() #define systemd_logind_fini() -#define systemd_logind_take_fd(major, minor, path) -1 -#define systemd_logind_release_fd(dev) +#define systemd_logind_take_fd(major, minor, path, paus) -1 +#define systemd_logind_release_fd(major, minor) #define systemd_logind_controls_session() 0 #define systemd_logind_vtenter() #endif diff --git a/xorg-server/include/xkbsrv.h b/xorg-server/include/xkbsrv.h index e79979927..f857b2280 100644 --- a/xorg-server/include/xkbsrv.h +++ b/xorg-server/include/xkbsrv.h @@ -638,6 +638,10 @@ extern _X_EXPORT void XkbHandleActions(DeviceIntPtr /* dev */ , DeviceEvent * /* event */ ); +extern void XkbPushLockedStateToSlaves(DeviceIntPtr /* master */, + int /* evtype */, + int /* key */); + extern _X_EXPORT Bool XkbEnableDisableControls(XkbSrvInfoPtr /* xkbi */ , unsigned long /* change */ , unsigned long /* newValues */ , -- cgit v1.2.3