From 0ea3a6811babc6e0d51b7a63bc51825ae4a0614a Mon Sep 17 00:00:00 2001 From: Jim Chen Date: Wed, 17 May 2017 13:06:21 -0400 Subject: [PATCH] Bug 1360321 - 2. Fix cast warning on AArch64 in plugin code; r=snorp Fix a warning on AArch64 for casting to pointer. MozReview-Commit-ID: 6zjYdN8ta9d --- dom/plugins/base/android/ANPSurface.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dom/plugins/base/android/ANPSurface.cpp b/dom/plugins/base/android/ANPSurface.cpp index b6a699f28577..9a539656713c 100644 --- a/dom/plugins/base/android/ANPSurface.cpp +++ b/dom/plugins/base/android/ANPSurface.cpp @@ -110,7 +110,7 @@ static inline void* getSurface(JNIEnv* env, jobject view) { env->DeleteLocalRef(holder); env->DeleteLocalRef(surface); - return (void*)surfacePointer; + return reinterpret_cast(uintptr_t(surfacePointer)); } static ANPBitmapFormat convertPixelFormat(int32_t format) {