From 25be105d7f0d9f657ce2adf2b4e659882fabb0eb Mon Sep 17 00:00:00 2001 From: Oscar Mateo Date: Tue, 12 Nov 2013 11:50:44 +0000 Subject: [PATCH] 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 Signed-off-by: Daniel Vetter --- 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, -- 2.7.4