diff options
| author | Oscar Mateo <oscar.mateo@intel.com> | 2013-11-12 11:50:44 +0000 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-11-12 12:16:23 +0100 |
| commit | 25be105d7f0d9f657ce2adf2b4e659882fabb0eb (patch) | |
| tree | 29b1733d170629017b46a1da7495e61d8ee2ba5b /lib | |
| parent | 235ff9cf34f37d7eb778d72acd298b0cd8c01ab5 (diff) | |
lib/igt_display: workaround a name conflict in Android
PLANE_A/PLANE_B are used by libdrm's i915_drm.h in Android.
v2: Changes suggested by Daniel Vetter and Damien Lespiau:
- Pimp up comment with a FIXME.
- Reword commit message.
Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/igt_display.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/igt_display.h b/lib/igt_display.h index 1357ce99..84638b2d 100644 --- a/lib/igt_display.h +++ b/lib/igt_display.h @@ -33,6 +33,10 @@ enum pipe { }; #define pipe_name(p) ((p) + 'A') +/* FIXME: i915_drm.h on Android pollutes the general namespace. */ +#undef PLANE_A +#undef PLANE_B + enum plane { PLANE_A = 0, PLANE_B, |