Fix 64-bit Mac OS X build bustage. b=543405
authorJosh Aas <joshmoz@gmail.com>
Thu, 08 Apr 2010 05:54:11 -0400
changeset 40587 657bebceeb185a593c33011d40cac233498db2b3
parent 40586 26dd5773a08ae5366e1482d271eed0ff49404bf8
child 40588 5a79877003e8a98b7b6f2e00ffcaed437e4428e1
push id12684
push userjosh@mozilla.com
push dateThu, 08 Apr 2010 09:54:59 +0000
treeherdermozilla-central@657bebceeb18 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs543405
milestone1.9.3a5pre
first release with
nightly linux32
657bebceeb18 / 3.7a5pre / 20100408031332 / files
nightly linux64
657bebceeb18 / 3.7a5pre / 20100408030620 / files
nightly mac
657bebceeb18 / 3.7a5pre / 20100408030618 / files
nightly win32
657bebceeb18 / 3.7a5pre / 20100408041901 / files
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
Fix 64-bit Mac OS X build bustage. b=543405
modules/plugin/base/src/nsNPAPIPlugin.cpp
--- a/modules/plugin/base/src/nsNPAPIPlugin.cpp
+++ b/modules/plugin/base/src/nsNPAPIPlugin.cpp
@@ -233,17 +233,17 @@ nsNPAPIPlugin::nsNPAPIPlugin()
 nsNPAPIPlugin::~nsNPAPIPlugin()
 {
   // reset the callbacks list
   memset((void*) &mPluginFuncs, 0, sizeof(mPluginFuncs));
   delete mLibrary;
   mLibrary = nsnull;
 }
 
-#if defined(XP_MACOSX)
+#if defined(XP_MACOSX) && !defined(__LP64__)
 void
 nsNPAPIPlugin::SetPluginRefNum(short aRefNum)
 {
   mPluginRefNum = aRefNum;
 }
 #endif
 
 #ifdef MOZ_IPC
@@ -461,17 +461,17 @@ nsNPAPIPlugin::CreatePluginInstance(nsIP
 nsresult
 nsNPAPIPlugin::Shutdown()
 {
   NPP_PLUGIN_LOG(PLUGIN_LOG_BASIC,
                  ("NPP Shutdown to be called: this=%p\n", this));
 
   NPError shutdownError;
   mLibrary->NP_Shutdown(&shutdownError);
-#ifdef XP_MACOSX
+#if defined(XP_MACOSX) && !defined(__LP64__)
   if (shutdownError == NS_OK && mPluginRefNum > 0)
     ::CloseResFile(mPluginRefNum);
 #endif
   return NS_OK;
 }
 
 nsresult
 nsNPAPIPlugin::GetMIMEDescription(const char* *resultingDesc)