From 91042b98afdc6cecc746e101a88f79e56db1c0d0 Mon Sep 17 00:00:00 2001
From: Alexandr Shadchin <Alexandr.Shadchin@gmail.com>
Date: Sat, 27 Aug 2011 00:47:34 +0600
Subject: [PATCH] bsd: OpenBSD and NetBSD not need extra headers in
 PCVT_SUPPORT

Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin@gmail.com>
Tested-by: Matthieu Herrb <matthieu.herrb@laas.fr>
---
 hw/xfree86/os-support/xf86_OSlib.h | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/hw/xfree86/os-support/xf86_OSlib.h b/hw/xfree86/os-support/xf86_OSlib.h
index cf928212c..fddde8ad1 100644
--- a/hw/xfree86/os-support/xf86_OSlib.h
+++ b/hw/xfree86/os-support/xf86_OSlib.h
@@ -277,20 +277,14 @@
 #     include <sys/console.h>
 #    endif
 #   endif /* SYSCONS_SUPPORT */
-#   if defined(PCVT_SUPPORT)
+#   if defined(PCVT_SUPPORT) && !defined(__NetBSD__) && !defined(__OpenBSD__)
 #    if !defined(SYSCONS_SUPPORT)
       /* no syscons, so include pcvt specific header file */
 #     if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 #      include <machine/pcvt_ioctl.h>
 #     else
-#      if defined(__NetBSD__) || defined(__OpenBSD__)
-#       if !defined(WSCONS_SUPPORT)
-#        include <machine/pcvt_ioctl.h>
-#       endif /* WSCONS_SUPPORT */
-#      else
-#       include <sys/pcvt_ioctl.h>
-#      endif /* __NetBSD__ */
-#     endif /* __FreeBSD_kernel__ || __OpenBSD__ */
+#      include <sys/pcvt_ioctl.h>
+#     endif /* __FreeBSD_kernel__ */
 #    else /* pcvt and syscons: hard-code the ID magic */
 #     define VGAPCVTID _IOWR('V',113, struct pcvtid)
       struct pcvtid {