commit 3b1cb037eea56dba0d134c6858f8ddc0f9743ff8
author Greg Hackmann <ghackmann@google.com> Fri Apr 04 00:08:11 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Apr 04 00:08:11 2014 +0000
tree 9a1a02f3ef30c5a6888fec197600fb528d7f3f56
parent fb3bbd1df323c24dc10c095f29ee8010fc3d1df0
parent 27f8840f228abfe5e2458a261ce5403871495a54

am 27f8840f: Merge "make struct Event layout consistent on 32/64-bit"

* commit '27f8840f228abfe5e2458a261ce5403871495a54':
  make struct Event layout consistent on 32/64-bit

include/gui/DisplayEventReceiver.h

diff --git a/include/gui/DisplayEventReceiver.h b/include/gui/DisplayEventReceiver.h
index f8267bf..a4718b9 100644
--- a/include/gui/DisplayEventReceiver.h
+++ b/include/gui/DisplayEventReceiver.h
@@ -49,7 +49,7 @@
         struct Header {
             uint32_t type;
             uint32_t id;
-            nsecs_t timestamp;
+            nsecs_t timestamp __attribute__((aligned(8)));
         };
 
         struct VSync {