summaryrefslogtreecommitdiff
path: root/console-tools
diff options
context:
space:
mode:
authorDenis Vlasenko2008-09-28 16:40:25 +0000
committerDenis Vlasenko2008-09-28 16:40:25 +0000
commitbacaff6e5474d6c5f080ce4cd2a55e8ff1ba5c94 (patch)
tree5ca8c92753ef2c2fb7d39f125dc90deb18cfc1b8 /console-tools
parent261cf4784fa39fb6cb3b7db99e809a7832d94d0a (diff)
downloadbusybox-1_12_1.zip
busybox-1_12_1.tar.gz
apply post-1.12.0 fixes, bump version to 1.12.11_12_1
Diffstat (limited to 'console-tools')
-rw-r--r--console-tools/showkey.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/console-tools/showkey.c b/console-tools/showkey.c
index e4603e2..95db6e1 100644
--- a/console-tools/showkey.c
+++ b/console-tools/showkey.c
@@ -50,7 +50,7 @@ static void signal_handler(int signo)
{
// restore keyboard and console settings
xset1(STDIN_FILENO, &tio0, "stdin");
- xioctl(STDIN_FILENO, KDSKBMODE, (void *)kbmode);
+ xioctl(STDIN_FILENO, KDSKBMODE, (void *)(ptrdiff_t)kbmode);
// alarmed? -> exit 0
exit(SIGALRM == signo);
}
@@ -95,7 +95,7 @@ int showkey_main(int argc UNUSED_PARAM, char **argv)
// we should exit on any signal
bb_signals(BB_FATAL_SIGS, signal_handler);
// set raw keyboard mode
- xioctl(STDIN_FILENO, KDSKBMODE, (void *)((option_mask32 & OPT_k) ? K_MEDIUMRAW : K_RAW));
+ xioctl(STDIN_FILENO, KDSKBMODE, (void *)(ptrdiff_t)((option_mask32 & OPT_k) ? K_MEDIUMRAW : K_RAW));
// read and show scancodes
while (1) {