xf86-video-intel: Unbreak build on OpenBSD

Commit Message

Mark Kettenis Feb. 15, 2014, 8:29 p.m. UTC

Fallout from the backlight helper changes.

Comments

Chris Wilson Feb. 18, 2014, 8:06 a.m. UTC | #1

On Sat, Feb 15, 2014 at 09:29:42PM +0100, Mark Kettenis wrote:
> Fallout from the backlight helper changes.

Apologies for missing this earlier. I have rearranged the code once
again to try to push the OpenBSD specifics down into src/backlight.c,
can you please check what needs to be fixed up now?
-Chris

Patch

diff --git a/src/backlight.c b/src/backlight.c
index b04b5f7..adc3e94 100644
--- a/src/backlight.c
+++ b/src/backlight.c
@@ -59,7 +59,9 @@ 
 
 #ifdef __OpenBSD__
 
+#include <sys/ioctl.h>
 #include <dev/wscons/wsconsio.h>
+#include <xf86Priv.h>
 
 int backlight_set(struct backlight *b, int level)
 {
diff --git a/src/uxa/intel_display.c b/src/uxa/intel_display.c
index c7c2d7c..d5a702c 100644
--- a/src/uxa/intel_display.c
+++ b/src/uxa/intel_display.c
@@ -181,6 +181,8 @@  intel_output_backlight_get(xf86OutputPtr output)
 static void
 intel_output_backlight_init(xf86OutputPtr output)
 {
+	struct intel_output *intel_output = output->driver_private;
+
 #ifdef __OpenBSD__
 	intel_output->backlight_active_level =
 		backlight_init(&intel_output->backlight, NULL);
@@ -189,7 +191,6 @@  intel_output_backlight_init(xf86OutputPtr output)
 			   "found backlight control interface\n");
 	}
 #else
-	struct intel_output *intel_output = output->driver_private;
 	intel_screen_private *intel = intel_get_screen_private(output->scrn);
 	char *str;
 	int i;