summaryrefslogtreecommitdiffstats
path: root/gralloc_drm.h
diff options
context:
space:
mode:
authorChih-Wei Huang <cwhuang@linux.org.tw>2015-04-19 14:17:51 +0800
committerChih-Wei Huang <cwhuang@linux.org.tw>2015-04-19 14:17:51 +0800
commit7e2e2ddd6a59af21b93e3638185bcbf69ca3cca5 (patch)
treed008a2a75a361d653e491578cd89c2e64aa481d5 /gralloc_drm.h
parent68a74eb31f139ad285a49451cf2ca8271c54f9bb (diff)
parentdc21193e3252ba2d6526546ba1d0c02116baf3ee (diff)
downloadexternal_drm_gralloc-7e2e2ddd6a59af21b93e3638185bcbf69ca3cca5.zip
external_drm_gralloc-7e2e2ddd6a59af21b93e3638185bcbf69ca3cca5.tar.gz
external_drm_gralloc-7e2e2ddd6a59af21b93e3638185bcbf69ca3cca5.tar.bz2
Merge remote-tracking branch 'x86/kitkat-x86' into lollipop-x86
Diffstat (limited to 'gralloc_drm.h')
-rw-r--r--gralloc_drm.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/gralloc_drm.h b/gralloc_drm.h
index c32aaf6..e53ecd9 100644
--- a/gralloc_drm.h
+++ b/gralloc_drm.h
@@ -31,6 +31,7 @@
extern "C" {
#endif
+#define MAX(a, b) (((a) > (b)) ? (a) : (b))
#define ALIGN(val, align) (((val) + (align) - 1) & ~((align) - 1))
struct gralloc_drm_t;