commit 786e26a886a3ade95f07178ba9c1538b79d7a31a
author Greg Hackmann <ghackmann@google.com> Fri Apr 04 01:53:51 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Apr 04 01:53:51 2014 +0000
tree 8126cd1ea7dc11f7d69b42b868f695d1fee5ebc5
parent f74865eb525b34af7983777a522a5bfc496fc1c5
parent 3b1cb037eea56dba0d134c6858f8ddc0f9743ff8

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

* commit '3b1cb037eea56dba0d134c6858f8ddc0f9743ff8':
  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 {