diff options
| author | Greg Hackmann <ghackmann@google.com> | 2014-03-07 03:02:20 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-07 03:02:20 +0000 |
| commit | a34eaccfe3b68ed3cf6bd7232325e82346b4ab9c (patch) | |
| tree | 33edc641a3f1a3934472d14ff3afb4d339d19167 /modules | |
| parent | 3f56a10cc39a46a9d17e59b64f7f744feba9d8c1 (diff) | |
| parent | b3d1dda5130ae1ae4eab6cb4fe56f5793bc66042 (diff) | |
| download | hardware_libhardware-a34eaccfe3b68ed3cf6bd7232325e82346b4ab9c.zip hardware_libhardware-a34eaccfe3b68ed3cf6bd7232325e82346b4ab9c.tar.gz hardware_libhardware-a34eaccfe3b68ed3cf6bd7232325e82346b4ab9c.tar.bz2 | |
am b3d1dda5: am b342abb6: Merge "gralloc: make private_handle_t layout consistent on 32/64-bit"
* commit 'b3d1dda5130ae1ae4eab6cb4fe56f5793bc66042':
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 |