summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Hackmann <ghackmann@google.com>2014-03-11 18:36:24 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-11 18:36:24 +0000
commit0444d6942db0c05881bde81a255ea0469006cd85 (patch)
tree64c4892def4309dc49c3242a236aa9c748337319
parenta225ca1f2b910fc1236a0397cc4ce6da4dc750e4 (diff)
parentb342abb6902a698963bb9d2108000da895845985 (diff)
downloadlibhardware-0444d6942db0c05881bde81a255ea0469006cd85.tar.gz
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
-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 22a57153..2cd10072 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