# 37239

r = rusty.lynch, a = brendan
OS/2 bringup continues on M16 - Change XP_PC #ifdef to have !defined XP_OS2

modules/plugin/base/src/ns4xPluginInstance.cpp

@@ -466,7 +466,7 @@ nsresult ns4xPluginInstance::InitializePlugin(nsIPluginInstancePeer* peer)
   // pinkerton
   // relies on routine descriptors, not present in carbon. We need to fix this.
 
-#ifdef XP_PC
+#if defined(XP_PC) && !defined(XP_OS2)
   // some really weird thing causes crash on 
   // http://www.vw.com/autoshow/index_flash.html for optimized build
   // try/catch construction misteriously prevent it

modules/plugin/nglsrc/ns4xPluginInstance.cpp

@@ -466,7 +466,7 @@ nsresult ns4xPluginInstance::InitializePlugin(nsIPluginInstancePeer* peer)
   // pinkerton
   // relies on routine descriptors, not present in carbon. We need to fix this.
 
-#ifdef XP_PC
+#if defined(XP_PC) && !defined(XP_OS2)
   // some really weird thing causes crash on 
   // http://www.vw.com/autoshow/index_flash.html for optimized build
   // try/catch construction misteriously prevent it