flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-06-11 09:56:22 +00:00
Code Issues Releases Wiki Activity

lib/igt_display: workaround a name conflict in Android

Browse Source 
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>
This commit is contained in:
Oscar Mateo 2013-11-12 11:50:44 +00:00 committed by Daniel Vetter
parent 235ff9cf34
commit 25be105d7f
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/igt_display.h
View File

@ -33,6 +33,10 @@ enum pipe {
}; };
#define pipe_name(p) ((p) + 'A') #define pipe_name(p) ((p) + 'A')
/* FIXME: i915_drm.h on Android pollutes the general namespace. */
#undef PLANE_A
#undef PLANE_B
enum plane { enum plane {
PLANE_A = 0, PLANE_A = 0,
PLANE_B, PLANE_B,