commit 0444d6942db0c05881bde81a255ea0469006cd85
author Greg Hackmann <ghackmann@google.com> Tue Mar 11 18:36:24 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Mar 11 18:36:24 2014 +0000
tree 64c4892def4309dc49c3242a236aa9c748337319
parent a225ca1f2b910fc1236a0397cc4ce6da4dc750e4
parent b342abb6902a698963bb9d2108000da895845985

am b342abb6: Merge "gralloc: make private_handle_t layout consistent on 32/64-bit"

* commit 'b342abb6902a698963bb9d2108000da895845985':
  gralloc: make private_handle_t layout consistent on 32/64-bit

modules/gralloc/gralloc_priv.h

diff --git a/modules/gralloc/gralloc_priv.h b/modules/gralloc/gralloc_priv.h
index 22a5715..2cd1007 100644
--- a/modules/gralloc/gralloc_priv.h
+++ b/modules/gralloc/gralloc_priv.h
@@ -75,7 +75,7 @@
     int     offset;
 
     // FIXME: the attributes below should be out-of-line
-    uintptr_t base;
+    uint64_t base __attribute__((aligned(8)));
     int     pid;
 
 #ifdef __cplusplus