commit 8256754b2e0763cb4e900e3ebb9c64e0ee0f62c5
author Colin Cross <ccross@android.com> Thu Dec 19 22:24:58 2013 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Dec 19 22:24:58 2013 +0000
tree 1dba0189957693d58c28af8b3bd82efb67d7aceb
parent 174345d689a0cd52d0aac5bd405ff9e846c11d2a
parent cd277b441029619a0d6dc7dfad7025c2c971d1ee

am cd277b44: am e6c4cd2f: Merge "exynos: gralloc: replace struct ion_handle with ion_user_handle_t"

* commit 'cd277b441029619a0d6dc7dfad7025c2c971d1ee':
  exynos: gralloc: replace struct ion_handle with ion_user_handle_t

include/gralloc_priv.h

diff --git a/include/gralloc_priv.h b/include/gralloc_priv.h
index bf2940e..bce84e4 100644
--- a/include/gralloc_priv.h
+++ b/include/gralloc_priv.h
@@ -33,6 +33,7 @@
 
 struct private_module_t;
 struct private_handle_t;
+typedef int ion_user_handle_t;
 
 struct private_module_t {
     gralloc_module_t base;
@@ -96,9 +97,9 @@
     void    *base;
     void    *base1;
     void    *base2;
-    struct ion_handle *handle;
-    struct ion_handle *handle1;
-    struct ion_handle *handle2;
+    ion_user_handle_t handle;
+    ion_user_handle_t handle1;
+    ion_user_handle_t handle2;
 
 #ifdef __cplusplus
     static const int sNumFds = 3;