Module Name: xsrc
Committed By: tsutsui
Date: Sun Oct 24 07:44:19 UTC 2010
Modified Files:
xsrc/external/mit/xf86-input-keyboard/dist/src: bsd_kbd.c
Log Message:
Make this compile with WARNS=2.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c
diff -u xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c:1.7 xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c:1.8
--- xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c:1.7 Sat May 22 21:20:17 2010
+++ xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c Sun Oct 24 07:44:19 2010
@@ -338,9 +338,9 @@
}
static void
-printWsType(char *type, char *devname)
+printWsType(const char *type, char *name)
{
- xf86Msg(X_PROBED, "%s: Keyboard type: %s\n", devname, type);
+ xf86Msg(X_PROBED, "%s: Keyboard type: %s\n", name, type);
}
#endif
@@ -452,8 +452,8 @@
#if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT) || defined (WSCONS_SUPPORT)
if (pKbd->isConsole &&
- ((pKbd->consType == SYSCONS) || (pKbd->consType == PCVT)) ||
- ((pKbd->consType == WSCONS)))
+ ((pKbd->consType == SYSCONS) || (pKbd->consType == PCVT) ||
+ (pKbd->consType == WSCONS)))
pKbd->vtSwitchSupported = TRUE;
#endif
