From e84f21db824b2e9e7fe660927ecfbbf04b068f7a Mon Sep 17 00:00:00 2001 From: "Owain G. Ainsworth" Date: Tue, 13 Jan 2009 17:02:59 +0000 Subject: use ifdef __linux__ where needed. since modesetting is compiled by default now, ifdef __linux__ the linux only includes and ioctls. (cherry picked from commit 1e8588ad5087c69eb77399cfaab8e4ec15eb4da9) --- src/i830_driver.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/i830_driver.c b/src/i830_driver.c index beb134d6..4c40d40a 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -1131,7 +1131,9 @@ i830SetHotkeyControl(ScrnInfoPtr pScrn, int mode) * DRM mode setting Linux only at this point... later on we could * add a wrapper here. */ +#ifdef __linux__ #include +#endif static Bool i830_kernel_mode_enabled(ScrnInfoPtr pScrn) { @@ -1157,7 +1159,9 @@ static Bool i830_kernel_mode_enabled(ScrnInfoPtr pScrn) if (ret) return FALSE; +#ifdef __linux__ ioctl(xf86Info.consoleFd, KDSETMODE, KD_TEXT); +#endif return TRUE; } -- cgit v1.2.3