From: Oscar Mateo <oscar.mateo@intel.com>
Date: Tue, 12 Nov 2013 11:50:44 +0000 (+0000)
Subject: lib/igt_display: workaround a name conflict in Android
X-Git-Tag: intel-gpu-tools-1.6~328
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=25be105d7f0d9f657ce2adf2b4e659882fabb0eb;p=platform%2Fupstream%2Fintel-gpu-tools.git

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>
---

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,