Bug 781545 - Fix PluginInstanceParent.cpp build with GCC 4.6 - r=bsmedberg
authorBenoit Jacob <bjacob@mozilla.com>
Thu, 09 Aug 2012 11:44:35 -0400
changeset 101967 2adcd343440494c5acf39d548ede7b47e2caab2e
parent 101966 28a61955e49cd1a46742af577d4b62d18b6980fb
child 101968 35451c7292baffccbc520298962a3288a0d7eb8e
child 102034 9efc7b150f4178452d9f159bcbe2b0cda1979362
push id13250
push userbjacob@mozilla.com
push dateThu, 09 Aug 2012 16:06:32 +0000
treeherdermozilla-inbound@2adcd3434404 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbsmedberg
bugs781545
milestone17.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 781545 - Fix PluginInstanceParent.cpp build with GCC 4.6 - r=bsmedberg
dom/plugins/ipc/PluginInstanceParent.cpp
--- a/dom/plugins/ipc/PluginInstanceParent.cpp
+++ b/dom/plugins/ipc/PluginInstanceParent.cpp
@@ -445,17 +445,17 @@ PluginInstanceParent::AnswerNPN_SetValue
         ImageContainer *container = GetImageContainer();
         if (!container) {
             *result = NPERR_GENERIC_ERROR;
             return true;
         }
 
         mDrawingModel = drawingModel;
         *result = mNPNIface->setvalue(mNPP, NPPVpluginDrawingModel,
-                                      (void*)drawingModel);
+                                      (void*)(intptr_t)drawingModel);
 
         if (mRemoteImageDataShmem.IsWritable()) {
             container->SetRemoteImageData(nullptr, nullptr);
             container->SetCompositionNotifySink(nullptr);
             DeallocShmem(mRemoteImageDataShmem);
             mRemoteImageDataMutex = NULL;
         }
     } else {