summaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorGreg Hackmann <ghackmann@google.com>2014-03-06 20:04:54 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-06 20:04:54 +0000
commitb3d1dda5130ae1ae4eab6cb4fe56f5793bc66042 (patch)
treeaecbc3055cc41326f6fcb37261773b64ca8f568f /modules
parentabd0a90bc02b2f574ea62a457d3302b1ce7cf7c8 (diff)
parentb342abb6902a698963bb9d2108000da895845985 (diff)
downloadhardware_libhardware-b3d1dda5130ae1ae4eab6cb4fe56f5793bc66042.zip
hardware_libhardware-b3d1dda5130ae1ae4eab6cb4fe56f5793bc66042.tar.gz
hardware_libhardware-b3d1dda5130ae1ae4eab6cb4fe56f5793bc66042.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.h2
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