diff options
author | Greg Hackmann <ghackmann@google.com> | 2014-03-11 18:36:24 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-11 18:36:24 +0000 |
commit | 0444d6942db0c05881bde81a255ea0469006cd85 (patch) | |
tree | 64c4892def4309dc49c3242a236aa9c748337319 /modules | |
parent | a225ca1f2b910fc1236a0397cc4ce6da4dc750e4 (diff) | |
parent | b342abb6902a698963bb9d2108000da895845985 (diff) | |
download | hardware_libhardware-0444d6942db0c05881bde81a255ea0469006cd85.zip hardware_libhardware-0444d6942db0c05881bde81a255ea0469006cd85.tar.gz hardware_libhardware-0444d6942db0c05881bde81a255ea0469006cd85.tar.bz2 |
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
Diffstat (limited to 'modules')
-rw-r--r-- | modules/gralloc/gralloc_priv.h | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ struct private_handle_t { int offset; // FIXME: the attributes below should be out-of-line - uintptr_t base; + uint64_t base __attribute__((aligned(8))); int pid; #ifdef __cplusplus |