xserver: Branch 'master' - 2 commits

[Matthieu Herrb]

 hw/xfree86/os-support/bsd/bsd_bell.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

New commits:
diff-tree 60de6c7ef9bdcee043f63e8e0d493e6feba6a9d0 (from parents)
Merge: 3a6549a163aba26bf4ac58b050c493fba0df14c6 2f13b7c113c17239e382dd3640e9c29201d8ab1f
Author: Matthieu Herrb <matthieu at deville.herrb.com>
Date:   Tue May 29 12:14:49 2007 -0600

    Merge branch 'master' of ssh://herrb@git.freedesktop.org/git/xorg/xserver

diff-tree 3a6549a163aba26bf4ac58b050c493fba0df14c6 (from 047bf3349bb697c73c95729a8bbf15f72605901f)
Author: Matthieu Herrb <matthieu at deville.herrb.com>
Date:   Tue May 29 12:14:23 2007 -0600

    Make this build on OpenBSD

diff --git a/hw/xfree86/os-support/bsd/bsd_bell.c b/hw/xfree86/os-support/bsd/bsd_bell.c
index b7a0c48..0d24201 100644
--- a/hw/xfree86/os-support/bsd/bsd_bell.c
+++ b/hw/xfree86/os-support/bsd/bsd_bell.c
@@ -27,7 +27,7 @@
 #include <xorg-config.h>
 #endif
 
-#if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)
+#if defined (SYSCONS_SUPPORT)
 #include <sys/kbio.h>
 #endif
 
@@ -77,7 +77,7 @@ xf86OSRingBell(int loudness, int pitch, 
                         wsb.pitch = pitch;
                         wsb.period = duration;
                         wsb.volume = loudness;
-                        ioctl(KBD_FD(xf86Info), WSKBDIO_COMPLEXBELL,
+                        ioctl(xf86Info.consoleFd, WSKBDIO_COMPLEXBELL,
                                       &wsb);
                         break;
 #endif