From 0c8a0935170e873ad2eace489bc3f8b79ab9b7e0 Mon Sep 17 00:00:00 2001 From: "mkaply%us.ibm.com" Date: Thu, 25 May 2000 14:30:56 +0000 Subject: [PATCH] # 37239 r = rusty.lynch, a = brendan OS/2 bringup continues on M16 - Change XP_PC #ifdef to have !defined XP_OS2 git-svn-id: svn://10.0.0.236/trunk@70842 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/modules/plugin/base/src/ns4xPluginInstance.cpp | 2 +- mozilla/modules/plugin/nglsrc/ns4xPluginInstance.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mozilla/modules/plugin/base/src/ns4xPluginInstance.cpp b/mozilla/modules/plugin/base/src/ns4xPluginInstance.cpp index d836cfa1e72..81c7ef91986 100644 --- a/mozilla/modules/plugin/base/src/ns4xPluginInstance.cpp +++ b/mozilla/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 diff --git a/mozilla/modules/plugin/nglsrc/ns4xPluginInstance.cpp b/mozilla/modules/plugin/nglsrc/ns4xPluginInstance.cpp index d836cfa1e72..81c7ef91986 100644 --- a/mozilla/modules/plugin/nglsrc/ns4xPluginInstance.cpp +++ b/mozilla/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