diff options
| author | Alexandr Shadchin <shadchin@cvs.openbsd.org> | 2012-08-08 16:44:08 +0000 |
|---|---|---|
| committer | Alexandr Shadchin <shadchin@cvs.openbsd.org> | 2012-08-08 16:44:08 +0000 |
| commit | bda26feaea1b2fd33b14ccb8c01eb83871c81efe (patch) | |
| tree | 7d122c7accf42251c5635c4d4e82811f60cd2d7e /sbin | |
| parent | 0eef813a9f61e1a86299a369c9b3a7c10e667208 (diff) | |
fix type (part from NetBSD)
ok miod@
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/wsconsctl/display.c | 4 | ||||
| -rw-r--r-- | sbin/wsconsctl/keyboard.c | 6 | ||||
| -rw-r--r-- | sbin/wsconsctl/mouse.c | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/sbin/wsconsctl/display.c b/sbin/wsconsctl/display.c index a1ca974b030..f33e10e9315 100644 --- a/sbin/wsconsctl/display.c +++ b/sbin/wsconsctl/display.c @@ -1,4 +1,4 @@ -/* $OpenBSD: display.c,v 1.16 2010/08/20 00:20:55 fgsch Exp $ */ +/* $OpenBSD: display.c,v 1.17 2012/08/08 16:44:07 shadchin Exp $ */ /* $NetBSD: display.c,v 1.1 1998/12/28 14:01:16 hannken Exp $ */ /*- @@ -40,7 +40,7 @@ #include <string.h> #include "wsconsctl.h" -int dpytype; +u_int dpytype; u_int width, height, depth; int focus; struct field_pc brightness, contrast, backlight; diff --git a/sbin/wsconsctl/keyboard.c b/sbin/wsconsctl/keyboard.c index bc617e43ed9..095b94f33b1 100644 --- a/sbin/wsconsctl/keyboard.c +++ b/sbin/wsconsctl/keyboard.c @@ -1,4 +1,4 @@ -/* $OpenBSD: keyboard.c,v 1.10 2010/08/20 00:20:55 fgsch Exp $ */ +/* $OpenBSD: keyboard.c,v 1.11 2012/08/08 16:44:07 shadchin Exp $ */ /* $NetBSD: keyboard.c 1.1 1998/12/28 14:01:17 hannken Exp $ */ /*- @@ -40,7 +40,7 @@ #include <stdio.h> #include "wsconsctl.h" -static int kbtype; +static u_int kbtype; static struct wskbd_bell_data bell; static struct wskbd_bell_data dfbell; static struct wscons_keymap mapdata[KS_NUMKEYCODES]; @@ -49,7 +49,7 @@ struct wskbd_map_data kbmap = { KS_NUMKEYCODES, mapdata }; /* used in map_parse. static struct wskbd_keyrepeat_data repeat; static struct wskbd_keyrepeat_data dfrepeat; static int ledstate; -static int kbdencoding; +static kbd_t kbdencoding; struct field keyboard_field_tab[] = { { "type", &kbtype, FMT_KBDTYPE, FLG_RDONLY }, diff --git a/sbin/wsconsctl/mouse.c b/sbin/wsconsctl/mouse.c index 650b8abafaa..a7ec3ed16af 100644 --- a/sbin/wsconsctl/mouse.c +++ b/sbin/wsconsctl/mouse.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mouse.c,v 1.12 2012/07/14 08:25:12 shadchin Exp $ */ +/* $OpenBSD: mouse.c,v 1.13 2012/08/08 16:44:07 shadchin Exp $ */ /* $NetBSD: mouse.c,v 1.3 1999/11/15 13:47:30 ad Exp $ */ /*- @@ -39,9 +39,9 @@ #include <stdio.h> #include "wsconsctl.h" -static int mstype; -static int resolution; -static int samplerate; +static u_int mstype; +static u_int resolution; +static u_int samplerate; static int rawmode; struct wsmouse_calibcoords wmcoords, wmcoords_save; |