From 5bb239084d1445503db36f276071c24ff4256ffc Mon Sep 17 00:00:00 2001 From: "pinkerton%netscape.com" Date: Mon, 10 May 1999 22:42:51 +0000 Subject: [PATCH] comment out some stuff when TARGET_CARBON is defined. Doesn't affect normal builds. git-svn-id: svn://10.0.0.236/trunk@31010 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/modules/plugin/base/src/ns4xPlugin.cpp | 5 +++++ mozilla/modules/plugin/nglsrc/ns4xPlugin.cpp | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/mozilla/modules/plugin/base/src/ns4xPlugin.cpp b/mozilla/modules/plugin/base/src/ns4xPlugin.cpp index 74347ba6be2..26e95ef2a90 100644 --- a/mozilla/modules/plugin/base/src/ns4xPlugin.cpp +++ b/mozilla/modules/plugin/base/src/ns4xPlugin.cpp @@ -48,6 +48,10 @@ ns4xPlugin::CheckClassInitialized(void) CALLBACKS.size = sizeof(CALLBACKS); CALLBACKS.version = (NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR; +#if !TARGET_CARBON +// pinkerton - these macros rely on BuildRoutineDescriptor(), which is no longer in +// Carbon. Our easy solution to this is to drop support for 68K plugins. Now we just +// need to do the work... CALLBACKS.geturl = NewNPN_GetURLProc(_geturl); CALLBACKS.posturl = NewNPN_PostURLProc(_posturl); CALLBACKS.requestread = NewNPN_RequestReadProc(_requestread); @@ -69,6 +73,7 @@ ns4xPlugin::CheckClassInitialized(void) CALLBACKS.invalidaterect = NewNPN_InvalidateRectProc(_invalidaterect); CALLBACKS.invalidateregion = NewNPN_InvalidateRegionProc(_invalidateregion); CALLBACKS.forceredraw = NewNPN_ForceRedrawProc(_forceredraw); +#endif initialized = TRUE; }; diff --git a/mozilla/modules/plugin/nglsrc/ns4xPlugin.cpp b/mozilla/modules/plugin/nglsrc/ns4xPlugin.cpp index 74347ba6be2..26e95ef2a90 100644 --- a/mozilla/modules/plugin/nglsrc/ns4xPlugin.cpp +++ b/mozilla/modules/plugin/nglsrc/ns4xPlugin.cpp @@ -48,6 +48,10 @@ ns4xPlugin::CheckClassInitialized(void) CALLBACKS.size = sizeof(CALLBACKS); CALLBACKS.version = (NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR; +#if !TARGET_CARBON +// pinkerton - these macros rely on BuildRoutineDescriptor(), which is no longer in +// Carbon. Our easy solution to this is to drop support for 68K plugins. Now we just +// need to do the work... CALLBACKS.geturl = NewNPN_GetURLProc(_geturl); CALLBACKS.posturl = NewNPN_PostURLProc(_posturl); CALLBACKS.requestread = NewNPN_RequestReadProc(_requestread); @@ -69,6 +73,7 @@ ns4xPlugin::CheckClassInitialized(void) CALLBACKS.invalidaterect = NewNPN_InvalidateRectProc(_invalidaterect); CALLBACKS.invalidateregion = NewNPN_InvalidateRegionProc(_invalidateregion); CALLBACKS.forceredraw = NewNPN_ForceRedrawProc(_forceredraw); +#endif initialized = TRUE; };