[Intel-gfx] [PATCH v2 10/11] lib/igt_display: workaround a name conflict in Android

[oscar.mateo at intel.com]

From: Oscar Mateo <oscar.mateo at intel.com>

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 at intel.com>
---
 lib/igt_display.h |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/igt_display.h b/lib/igt_display.h
index 1357ce9..84638b2 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,
-- 
1.7.9.5