diff mbox

[v2,10/11] lib/igt_display: workaround a name conflict in Android

Message ID 1384257045-15524-11-git-send-email-oscar.mateo@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

oscar.mateo@intel.com Nov. 12, 2013, 11:50 a.m. UTC 
From: Oscar Mateo <oscar.mateo@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@intel.com>
---
 lib/igt_display.h |    4 ++++
 1 file changed, 4 insertions(+)
diff mbox

Patch

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,