From d5e97f93f0aee11952b08d1083623f4e63a36b72 Mon Sep 17 00:00:00 2001
From: Greg Hackmann <ghackmann@google.com>
Date: Wed, 11 Mar 2015 16:47:15 -0700
Subject: [PATCH] Fix 64-bit MessageQueue JNI build

Change-Id: I75b3788e7dcece4a2d64d969a10d28e7a9593cd6
Signed-off-by: Greg Hackmann <ghackmann@google.com>
---
 core/jni/android_os_MessageQueue.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/jni/android_os_MessageQueue.cpp b/core/jni/android_os_MessageQueue.cpp
index 854e6b7b0507e..6e5e67c717bfe 100644
--- a/core/jni/android_os_MessageQueue.cpp
+++ b/core/jni/android_os_MessageQueue.cpp
@@ -149,7 +149,7 @@ int NativeMessageQueue::handleEvent(int fd, int looperEvents, void* data) {
     if (looperEvents & (Looper::EVENT_ERROR | Looper::EVENT_HANGUP | Looper::EVENT_INVALID)) {
         events |= CALLBACK_EVENT_ERROR;
     }
-    int oldWatchedEvents = reinterpret_cast<int>(data);
+    int oldWatchedEvents = reinterpret_cast<intptr_t>(data);
     int newWatchedEvents = mPollEnv->CallIntMethod(mPollObj,
             gMessageQueueClassInfo.dispatchEvents, fd, events);
     if (!newWatchedEvents) {