diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2014-08-05 16:38:42 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2014-08-05 16:38:42 +0100 |
| commit | f36b7a4aac86f5874c32d8f516ac1f00a6c8d8b3 (patch) | |
| tree | 47b90dd703c47ec62f1747c7bb0eb45492aa9c11 /src/intel_driver.h | |
| parent | c5e654cf2afcafbe3732548359771747dac1ce26 (diff) | |
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 <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/intel_driver.h')
| -rw-r--r-- | src/intel_driver.h | 2 |
1 files changed, 1 insertions, 1 deletions
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; \ }) |