diff options
| author | marha <marha@users.sourceforge.net> | 2012-05-15 15:07:22 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-05-15 15:07:22 +0200 |
| commit | 9818207986d5db9831e43eb2a640be68f54bb2ef (patch) | |
| tree | e1ac6d17b2da887a2110c1337f01fc6fbdfa68fd /xorg-server/hw/kdrive | |
| parent | e6ff1fe09702cb307729b3208175c84f623f2968 (diff) | |
| parent | 062c45ff0df6a52080dcd74433710d47127cbe29 (diff) | |
| download | vcxsrv-9818207986d5db9831e43eb2a640be68f54bb2ef.tar.gz vcxsrv-9818207986d5db9831e43eb2a640be68f54bb2ef.tar.bz2 vcxsrv-9818207986d5db9831e43eb2a640be68f54bb2ef.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'xorg-server/hw/kdrive')
| -rw-r--r-- | xorg-server/hw/kdrive/src/kdrive.h | 3 | ||||
| -rw-r--r-- | xorg-server/hw/kdrive/src/kinput.c | 2 |
2 files changed, 0 insertions, 5 deletions
diff --git a/xorg-server/hw/kdrive/src/kdrive.h b/xorg-server/hw/kdrive/src/kdrive.h index 4125307f3..c20a0846a 100644 --- a/xorg-server/hw/kdrive/src/kdrive.h +++ b/xorg-server/hw/kdrive/src/kdrive.h @@ -552,9 +552,6 @@ void KdEnableInput(void); void - ProcessInputEvents(void); - -void KdRingBell(KdKeyboardInfo * ki, int volume, int pitch, int duration); /* kmode.c */ diff --git a/xorg-server/hw/kdrive/src/kinput.c b/xorg-server/hw/kdrive/src/kinput.c index 0cb890ed2..0f2a4ae0f 100644 --- a/xorg-server/hw/kdrive/src/kinput.c +++ b/xorg-server/hw/kdrive/src/kinput.c @@ -725,8 +725,6 @@ KdKbdCtrl(DeviceIntPtr pDevice, KeybdCtrl * ctrl) ki->bellDuration = ctrl->bell_duration; } -extern KeybdCtrl defaultKeyboardControl; - static int KdKeyboardProc(DeviceIntPtr pDevice, int onoff) { |