diff options
| author | marha <marha@users.sourceforge.net> | 2014-03-12 16:45:42 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-03-12 16:45:42 +0100 |
| commit | cc6db22a772cc52ead6a5c11d7d02e7364f6326c (patch) | |
| tree | d80b42172d703ec20ccd99c68a067505e2706899 /xorg-server/include/systemd-logind.h | |
| parent | 2112b7dec49833ba872bd3ebcd7288930fec0796 (diff) | |
| parent | cd8b0d0de3fcb53f6d3ece8ce26d97aaab2c0914 (diff) | |
| download | vcxsrv-cc6db22a772cc52ead6a5c11d7d02e7364f6326c.tar.gz vcxsrv-cc6db22a772cc52ead6a5c11d7d02e7364f6326c.tar.bz2 vcxsrv-cc6db22a772cc52ead6a5c11d7d02e7364f6326c.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa xserver xkbcomp git update 12 Mar 2014
Diffstat (limited to 'xorg-server/include/systemd-logind.h')
| -rw-r--r-- | xorg-server/include/systemd-logind.h | 4 |
1 files changed, 2 insertions, 2 deletions
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 |