[PATCH xserver 6/8] bsd: OpenBSD and NetBSD not need extra headers in PCVT_SUPPORT
Alexandr Shadchin
alexandr.shadchin at gmail.com
Thu Sep 15 10:20:26 PDT 2011
Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin at gmail.com>
---
hw/xfree86/os-support/xf86_OSlib.h | 12 +++---------
1 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/hw/xfree86/os-support/xf86_OSlib.h b/hw/xfree86/os-support/xf86_OSlib.h
index cf92821..fddde8a 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 {
--
1.7.6
More information about the xorg-devel
mailing list