From f36b7a4aac86f5874c32d8f516ac1f00a6c8d8b3 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Tue, 5 Aug 2014 16:38:42 +0100 Subject: intel: Use NOACCEL to avoid a symbol clash on old Xorg Old Xorg xf86str.h defines NONE preventing us from using it within an enum. Use NOACCEL instead. Signed-off-by: Chris Wilson --- src/intel_driver.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/intel_driver.h') diff --git a/src/intel_driver.h b/src/intel_driver.h index 7ce6b752..13e26886 100644 --- a/src/intel_driver.h +++ b/src/intel_driver.h @@ -136,7 +136,7 @@ int intel_put_master(ScrnInfoPtr scrn); void intel_put_device(ScrnInfoPtr scrn); #define IS_DEFAULT_ACCEL_METHOD(x) ({ \ - enum { SNA, UXA, GLAMOR, NONE } default_accel_method__ = DEFAULT_ACCEL_METHOD; \ + enum { NOACCEL, SNA, UXA, GLAMOR } default_accel_method__ = DEFAULT_ACCEL_METHOD; \ default_accel_method__ == x; \ }) -- cgit v1.2.3