Bug 781545 - Fix PluginInstanceParent.cpp build with GCC 4.6 - r=bsmedberg
☠☠ backed out by 28a61955e49c ☠ ☠
authorBenoit Jacob <bjacob@mozilla.com>
Thu, 09 Aug 2012 11:44:35 -0400
changeset 101965 c69b5af20a85c3e237cba78c87b0cb968214739f
parent 101964 66b421cf32b942cdcf40d2250db97a12ae64b261
child 101966 28a61955e49cd1a46742af577d4b62d18b6980fb
push id13248
push userbjacob@mozilla.com
push dateThu, 09 Aug 2012 15:44:46 +0000
treeherdermozilla-inbound@c69b5af20a85 [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 {