From 810f6cfdf2fee9c5ce6c0b1bb349e6cbaa31cd71 Mon Sep 17 00:00:00 2001 From: "beard%netscape.com" Date: Mon, 30 Nov 1998 22:15:00 +0000 Subject: [PATCH] Mac shared library migration. git-svn-id: svn://10.0.0.236/trunk@15474 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/base/macbuild/base.mcp | Bin 128926 -> 119195 bytes mozilla/base/src/nscore.h | 4 +- mozilla/build/mac/NGLayoutBuildList.pm | 173 +++++++++--------- mozilla/cmd/macfe/utility/xp_file_mac.cp | 3 +- mozilla/dom/macbuild/dom.mcp | Bin 99819 -> 111308 bytes mozilla/dom/src/build/nsDOMFactory.cpp | 4 +- mozilla/gfx/macbuild/GFXSharedDebugPrefix.h | 2 +- mozilla/gfx/macbuild/GFXSharedPrefix.h | 4 +- mozilla/gfx/macbuild/gfx.mcp | Bin 119229 -> 95150 bytes mozilla/gfx/src/mac/nsFontMetricsMac.cpp | 2 +- mozilla/gfx/src/mac/nsGfxFactoryMac.cpp | 10 +- mozilla/htmlparser/macbuild/htmlparser.mcp | Bin 51632 -> 81504 bytes mozilla/htmlparser/src/nsParserFactory.cpp | 2 +- mozilla/jpeg/macbuild/JPEG.mcp | Bin 87689 -> 85813 bytes mozilla/layout/build/nsLayoutFactory.cpp | 7 +- mozilla/layout/macbuild/layout.mcp | Bin 135918 -> 111012 bytes mozilla/lib/mac/Misc/mactime.c | 11 +- mozilla/lib/xp/xp_stub.c | 2 + mozilla/modules/libimg/macbuild/libimg.mcp | Bin 144883 -> 110313 bytes mozilla/modules/libimg/src/xpcompat.cpp | 70 +++++-- mozilla/modules/libpref/macbuild/libpref.mcp | Bin 113139 -> 113139 bytes .../modules/libpref/src/mac/MacPrefUtils.cpp | 142 +++++++++++++- mozilla/modules/libpref/src/mac/macpref.cp | 26 ++- mozilla/modules/libpref/src/nsPref.cpp | 8 - mozilla/modules/libpref/src/prefapi.c | 19 +- mozilla/modules/libpref/src/prefapi.cpp | 19 +- mozilla/network/macbuild/network.mcp | Bin 163837 -> 124575 bytes mozilla/network/module/nsNetFactory.cpp | 3 +- .../parser/htmlparser/macbuild/htmlparser.mcp | Bin 51632 -> 81504 bytes .../parser/htmlparser/src/nsParserFactory.cpp | 2 +- mozilla/view/macbuild/view.mcp | Bin 95006 -> 134929 bytes mozilla/view/src/nsViewFactory.cpp | 6 +- mozilla/webshell/macbuild/webshell.mcp | Bin 146078 -> 170756 bytes mozilla/webshell/src/nsDLLFactory.cpp | 6 +- mozilla/webshell/tests/viewer/mac/viewer.mcp | Bin 171575 -> 171767 bytes .../tests/viewer/macToBeImplemented.cp | 76 ++++++++ .../webshell/tests/viewer/nsSetupRegistry.cpp | 6 - .../widget/macbuild/WidgetSharedDebugPrefix.h | 3 +- mozilla/widget/macbuild/WidgetSharedPrefix.h | 3 +- mozilla/widget/macbuild/widget.mcp | Bin 82967 -> 71120 bytes mozilla/widget/src/mac/nsMacMessagePump.cpp | 2 +- mozilla/widget/src/mac/nsWidgetFactory.cpp | 11 +- mozilla/xpcom/components/nsMacRepository.h | 5 +- mozilla/xpcom/components/nsRepository.cpp | 2 + mozilla/xpcom/macbuild/xpcom.exp | 6 + mozilla/xpcom/macbuild/xpcomPPC.mcp | Bin 129189 -> 82200 bytes mozilla/xpcom/public/nsMacRepository.h | 5 +- mozilla/xpcom/src/nsRepository.cpp | 2 + mozilla/xpfe/macbuild/xpfeviewer.mcp | Bin 173687 -> 166139 bytes mozilla/xpfe/xpviewer/src/nsSetupRegistry.cpp | 6 - 50 files changed, 473 insertions(+), 179 deletions(-) diff --git a/mozilla/base/macbuild/base.mcp b/mozilla/base/macbuild/base.mcp index 2b2a344a0c7d01de0fa61ad4fe7b7f74975de533..c46ac17b79ea6f05f9ee127265b5d05d2f276718 100644 GIT binary patch delta 12685 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 delta 6897 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 diff --git a/mozilla/base/src/nscore.h b/mozilla/base/src/nscore.h index 2eecf758a4d..2cba7e48115 100644 --- a/mozilla/base/src/nscore.h +++ b/mozilla/base/src/nscore.h @@ -73,8 +73,8 @@ typedef PRUcs2 PRUnichar; #undef NS_EXPORT #undef NS_EXPORT_ -#define NS_EXPORT -#define NS_EXPORT_(type) type +#define NS_EXPORT __declspec(export) +#define NS_EXPORT_(type) type __declspec(export) #else /* XXX do something useful? */ diff --git a/mozilla/build/mac/NGLayoutBuildList.pm b/mozilla/build/mac/NGLayoutBuildList.pm index edc6519feb1..32038db9f7d 100644 --- a/mozilla/build/mac/NGLayoutBuildList.pm +++ b/mozilla/build/mac/NGLayoutBuildList.pm @@ -117,8 +117,12 @@ sub Checkout() #// if ($main::pull{all}) { - $session->checkout("RaptorMac") || die "checkout failure"; - $session->checkout("mozilla/modules/libpref") || die "checkout failure"; + $session->checkout("RaptorMac") || die "checkout failure"; + #//$session->checkout("mozilla/modules/libpref") || die "checkout failure"; + + #// beard: additional libraries needed to make shared libraries link. + #//$session->checkout("mozilla/lib/mac/PowerPlant") || die "checkout failure"; + #//$session->checkout("mozilla/lib/xlate") || die "checkout failure"; } } @@ -141,21 +145,21 @@ sub BuildDist() #MAC_COMMON InstallFromManifest(":mozilla:build:mac:MANIFEST", "$distdirectory:mac:common:"); InstallFromManifest(":mozilla:lib:mac:NSStdLib:include:MANIFEST", "$distdirectory:mac:common:"); - InstallFromManifest(":mozilla:lib:mac:MacMemoryAllocator:include:MANIFEST", "$distdirectory:mac:common:"); + InstallFromManifest(":mozilla:lib:mac:MacMemoryAllocator:include:MANIFEST", "$distdirectory:mac:common:"); InstallFromManifest(":mozilla:lib:mac:Misc:MANIFEST", "$distdirectory:mac:common:"); InstallFromManifest(":mozilla:lib:mac:MoreFiles:MANIFEST", "$distdirectory:mac:common:morefiles:"); #INCLUDE - InstallFromManifest(":mozilla:config:mac:MANIFEST", "$distdirectory:config:"); + InstallFromManifest(":mozilla:config:mac:MANIFEST", "$distdirectory:config:"); InstallFromManifest(":mozilla:config:mac:MANIFEST_config", "$distdirectory:config:"); InstallFromManifest(":mozilla:include:MANIFEST", "$distdirectory:include:"); InstallFromManifest(":mozilla:cmd:macfe:pch:MANIFEST", "$distdirectory:include:"); InstallFromManifest(":mozilla:cmd:macfe:utility:MANIFEST", "$distdirectory:include:"); #NSPR - InstallFromManifest(":mozilla:nsprpub:pr:include:MANIFEST", "$distdirectory:nspr:"); + InstallFromManifest(":mozilla:nsprpub:pr:include:MANIFEST", "$distdirectory:nspr:"); InstallFromManifest(":mozilla:nsprpub:pr:src:md:mac:MANIFEST", "$distdirectory:nspr:mac:"); - InstallFromManifest(":mozilla:nsprpub:lib:ds:MANIFEST", "$distdirectory:nspr:"); + InstallFromManifest(":mozilla:nsprpub:lib:ds:MANIFEST", "$distdirectory:nspr:"); InstallFromManifest(":mozilla:nsprpub:lib:libc:include:MANIFEST", "$distdirectory:nspr:"); InstallFromManifest(":mozilla:nsprpub:lib:msgc:include:MANIFEST", "$distdirectory:nspr:"); @@ -163,58 +167,58 @@ sub BuildDist() InstallFromManifest(":mozilla:jpeg:MANIFEST", "$distdirectory:jpeg:"); #LIBREG - InstallFromManifest(":mozilla:modules:libreg:include:MANIFEST", "$distdirectory:libreg:"); + InstallFromManifest(":mozilla:modules:libreg:include:MANIFEST", "$distdirectory:libreg:"); #XPCOM - InstallFromManifest(":mozilla:xpcom:public:MANIFEST", "$distdirectory:xpcom:"); + InstallFromManifest(":mozilla:xpcom:public:MANIFEST", "$distdirectory:xpcom:"); #ZLIB InstallFromManifest(":mozilla:modules:zlib:src:MANIFEST", "$distdirectory:zlib:"); #LIBUTIL - InstallFromManifest(":mozilla:modules:libutil:public:MANIFEST", "$distdirectory:libutil:"); + InstallFromManifest(":mozilla:modules:libutil:public:MANIFEST", "$distdirectory:libutil:"); #SUN_JAVA - InstallFromManifest(":mozilla:sun-java:stubs:include:MANIFEST", "$distdirectory:sun-java:"); + InstallFromManifest(":mozilla:sun-java:stubs:include:MANIFEST", "$distdirectory:sun-java:"); InstallFromManifest(":mozilla:sun-java:stubs:macjri:MANIFEST", "$distdirectory:sun-java:"); #NAV_JAVA - InstallFromManifest(":mozilla:nav-java:stubs:include:MANIFEST", "$distdirectory:nav-java:"); + InstallFromManifest(":mozilla:nav-java:stubs:include:MANIFEST", "$distdirectory:nav-java:"); InstallFromManifest(":mozilla:nav-java:stubs:macjri:MANIFEST", "$distdirectory:nav-java:"); #JS - InstallFromManifest(":mozilla:js:src:MANIFEST", "$distdirectory:js:"); + InstallFromManifest(":mozilla:js:src:MANIFEST", "$distdirectory:js:"); #SECURITY_freenav InstallFromManifest(":mozilla:modules:security:freenav:MANIFEST", "$distdirectory:security:"); #LIBPREF - InstallFromManifest(":mozilla:modules:libpref:public:MANIFEST", "$distdirectory:libpref:"); + InstallFromManifest(":mozilla:modules:libpref:public:MANIFEST", "$distdirectory:libpref:"); #LIBIMAGE - InstallFromManifest(":mozilla:modules:libimg:png:MANIFEST", "$distdirectory:libimg:"); - InstallFromManifest(":mozilla:modules:libimg:src:MANIFEST", "$distdirectory:libimg:"); + InstallFromManifest(":mozilla:modules:libimg:png:MANIFEST", "$distdirectory:libimg:"); + InstallFromManifest(":mozilla:modules:libimg:src:MANIFEST", "$distdirectory:libimg:"); InstallFromManifest(":mozilla:modules:libimg:public:MANIFEST", "$distdirectory:libimg:"); #PLUGIN InstallFromManifest(":mozilla:modules:plugin:nglsrc:MANIFEST", "$distdirectory:plugin:"); InstallFromManifest(":mozilla:modules:plugin:public:MANIFEST", "$distdirectory:plugin:"); - InstallFromManifest(":mozilla:modules:plugin:src:MANIFEST", "$distdirectory:plugin:"); + InstallFromManifest(":mozilla:modules:plugin:src:MANIFEST", "$distdirectory:plugin:"); InstallFromManifest(":mozilla:modules:oji:src:MANIFEST", "$distdirectory:oji:"); - InstallFromManifest(":mozilla:modules:oji:public:MANIFEST", "$distdirectory:oji:"); + InstallFromManifest(":mozilla:modules:oji:public:MANIFEST", "$distdirectory:oji:"); #LAYERS (IS THIS STILL NEEDED) InstallFromManifest(":mozilla:lib:liblayer:include:MANIFEST", "$distdirectory:layers:"); #NETWORK InstallFromManifest(":mozilla:network:cache:MANIFEST", "$distdirectory:network:"); - InstallFromManifest(":mozilla:network:client:MANIFEST", "$distdirectory:network:"); + InstallFromManifest(":mozilla:network:client:MANIFEST", "$distdirectory:network:"); InstallFromManifest(":mozilla:network:cnvts:MANIFEST", "$distdirectory:network:"); InstallFromManifest(":mozilla:network:cstream:MANIFEST", "$distdirectory:network:"); InstallFromManifest(":mozilla:network:main:MANIFEST", "$distdirectory:network:"); InstallFromManifest(":mozilla:network:mimetype:MANIFEST", "$distdirectory:network:"); InstallFromManifest(":mozilla:network:util:MANIFEST", "$distdirectory:network:"); - InstallFromManifest(":mozilla:network:protocol:about:MANIFEST", "$distdirectory:network:"); + InstallFromManifest(":mozilla:network:protocol:about:MANIFEST", "$distdirectory:network:"); InstallFromManifest(":mozilla:network:protocol:certld:MANIFEST", "$distdirectory:network:"); InstallFromManifest(":mozilla:network:protocol:dataurl:MANIFEST", "$distdirectory:network:"); InstallFromManifest(":mozilla:network:protocol:file:MANIFEST", "$distdirectory:network:"); @@ -228,7 +232,7 @@ sub BuildDist() InstallFromManifest(":mozilla:network:protocol:pop3:MANIFEST", "$distdirectory:network:"); InstallFromManifest(":mozilla:network:protocol:remote:MANIFEST", "$distdirectory:network:"); InstallFromManifest(":mozilla:network:protocol:smtp:MANIFEST", "$distdirectory:network:"); - InstallFromManifest(":mozilla:network:module:MANIFEST", "$distdirectory:network:module"); + InstallFromManifest(":mozilla:network:module:MANIFEST", "$distdirectory:network:module"); #BASE InstallFromManifest(":mozilla:base:src:MANIFEST", "$distdirectory:base:"); @@ -239,7 +243,7 @@ sub BuildDist() #LAYOUT InstallFromManifest(":mozilla:layout:build:MANIFEST", "$distdirectory:layout:"); - InstallFromManifest(":mozilla:layout:base:public:MANIFEST", "$distdirectory:layout:"); + InstallFromManifest(":mozilla:layout:base:public:MANIFEST", "$distdirectory:layout:"); InstallFromManifest(":mozilla:layout:html:style:public:MANIFEST", "$distdirectory:layout:"); InstallFromManifest(":mozilla:layout:html:base:src:MANIFEST", "$distdirectory:layout:"); InstallFromManifest(":mozilla:layout:base:src:MANIFEST", "$distdirectory:layout:"); @@ -248,10 +252,10 @@ sub BuildDist() #WIDGET InstallFromManifest(":mozilla:widget:public:MANIFEST", "$distdirectory:widget:"); - InstallFromManifest(":mozilla:widget:src:mac:MANIFEST", "$distdirectory:widget:"); + InstallFromManifest(":mozilla:widget:src:mac:MANIFEST", "$distdirectory:widget:"); #GFX - InstallFromManifest(":mozilla:gfx:src:MANIFEST", "$distdirectory:gfx:"); + InstallFromManifest(":mozilla:gfx:src:MANIFEST", "$distdirectory:gfx:"); InstallFromManifest(":mozilla:gfx:public:MANIFEST", "$distdirectory:gfx:"); #VIEW @@ -262,7 +266,7 @@ sub BuildDist() InstallFromManifest(":mozilla:dom:public:coreDom:MANIFEST", "$distdirectory:dom:"); InstallFromManifest(":mozilla:dom:public:coreEvents:MANIFEST", "$distdirectory:dom:"); InstallFromManifest(":mozilla:dom:public:events:MANIFEST", "$distdirectory:dom:"); - InstallFromManifest(":mozilla:dom:public:html:MANIFEST", "$distdirectory:dom:"); + InstallFromManifest(":mozilla:dom:public:html:MANIFEST", "$distdirectory:dom:"); InstallFromManifest(":mozilla:dom:public:css:MANIFEST", "$distdirectory:dom:"); InstallFromManifest(":mozilla:dom:src:jsurl:MANIFEST", "$distdirectory:dom:"); @@ -298,6 +302,11 @@ sub BuildCommonProjects() Moz::BuildProjectClean(":mozilla:lib:mac:NSRuntime:NSRuntime.mcp", "Stubs"); Moz::BuildProjectClean(":mozilla:cmd:macfe:projects:client:Client.mcp", "Stubs"); + #// + #// Stub libraries + #// + BuildProject(":mozilla:modules:security:freenav:macbuild:NoSecurity.mcp", "Security.o"); + #// #// Shared libraries #// @@ -341,30 +350,14 @@ sub BuildCommonProjects() BuildProject(":mozilla:modules:zlib:macbuild:zlib.mcp", "zlib$D.shlb"); MakeAlias(":mozilla:modules:zlib:macbuild:zlib$D.shlb", "$dist_dir"); $main::DEBUG ? MakeAlias(":mozilla:modules:zlib:macbuild:zlib$D.shlb.xSYM", "$dist_dir") : 0; - - #// - #// Static libraries - #// - if ($main::SHARED) - { - BuildProject(":mozilla:xpcom:macbuild:xpcomPPC.mcp", "xpcom$D.shlb"); - $main::DEBUG ? MakeAlias(":mozilla:xpcom:macbuild:xpcom$D.shlb.xSYM", "$dist_dir") : 0; - BuildProject(":mozilla:modules:security:freenav:macbuild:NoSecurity.mcp", "Security.o"); - BuildProject(":mozilla:modules:libimg:macbuild:png.mcp", "png$D.o"); - BuildProject(":mozilla:modules:libimg:macbuild:libimg.mcp", "libimg$D.o (standalone)"); + BuildProject(":mozilla:xpcom:macbuild:xpcomPPC.mcp", "xpcom$D.shlb"); + MakeAlias(":mozilla:xpcom:macbuild:xpcom$D.shlb", "$dist_dir"); + $main::DEBUG ? MakeAlias(":mozilla:xpcom:macbuild:xpcom$D.shlb.xSYM", "$dist_dir") : 0; - BuildProject(":mozilla:network:macbuild:network.mcp", "network$D.shlb"); - $main::DEBUG ? MakeAlias(":mozilla:network:macbuild:network$D.shlb.xSYM", "$dist_dir") : 0; - } - else - { - BuildProject(":mozilla:xpcom:macbuild:xpcomPPC.mcp", "xpcom$D.o"); - BuildProject(":mozilla:modules:security:freenav:macbuild:NoSecurity.mcp", "Security.o"); - BuildProject(":mozilla:modules:libimg:macbuild:png.mcp", "png$D.o"); - BuildProject(":mozilla:modules:libimg:macbuild:libimg.mcp", "libimg$D.o (standalone)"); - BuildProject(":mozilla:network:macbuild:network.mcp", "NetworkModular$D.o"); - } + BuildProject(":mozilla:modules:libpref:macbuild:libpref.mcp", "libpref$D.shlb"); + MakeAlias(":mozilla:modules:libpref:macbuild:libpref$D.shlb", "$dist_dir"); + $main::DEBUG ? MakeAlias(":mozilla:modules:libpref:macbuild:libpref$D.shlb.xSYM", "$dist_dir") : 0; } @@ -400,72 +393,76 @@ sub BuildLayoutProjects() # $D becomes a suffix to target names for selecting either the debug or non-debug target of a project my($D) = $main::DEBUG ? "Debug" : ""; my($dist_dir) = _getDistDirectory(); - + #// #// Make aliases of resource files #// my($resource_dir) = "$dist_dir" . "res:"; - MakeAlias(":mozilla:layout:html:document:src:ua.css", "$resource_dir"); + MakeAlias(":mozilla:layout:html:document:src:ua.css", "$resource_dir"); my($html_dir) = "$resource_dir" . "html:"; - MakeAlias(":mozilla:layout:html:base:src:broken-image.gif", "$html_dir"); + MakeAlias(":mozilla:layout:html:base:src:broken-image.gif", "$html_dir"); my($throbber_dir) = "$resource_dir" . "throbber:"; - BuildResourceAliases(":mozilla:webshell:tests:viewer:throbber:", "$throbber_dir"); + BuildResourceAliases(":mozilla:webshell:tests:viewer:throbber:", "$throbber_dir"); my($samples_dir) = "$resource_dir" . "samples:"; - BuildResourceAliases(":mozilla:webshell:tests:viewer:samples:", "$samples_dir"); + BuildResourceAliases(":mozilla:webshell:tests:viewer:samples:", "$samples_dir"); my($chrome_dir) = "$resource_dir" . "chrome:"; - BuildResourceAliases(":mozilla:xpfe:xpviewer:src:resources:chrome:", "$chrome_dir"); + BuildResourceAliases(":mozilla:xpfe:xpviewer:src:resources:chrome:", "$chrome_dir"); my($toolbar_dir) = "$resource_dir" . "toolbar:"; - BuildResourceAliases(":mozilla:xpfe:xpviewer:src:resources:toolbar:", "$toolbar_dir"); + BuildResourceAliases(":mozilla:xpfe:xpviewer:src:resources:toolbar:", "$toolbar_dir"); #// #// Build Layout projects #// - if ($main::SHARED) - { - BuildProject(":mozilla:base:macbuild:base.mcp", "base$D.o"); - #BuildProject(":mozilla:base:macbuild:base.mcp", "base$D.shlb"); - #$main::DEBUG ? MakeAlias(":mozilla:base:macbuild:base$D.shlb.xSYM", "$dist_dir") : 0; + BuildProject(":mozilla:base:macbuild:base.mcp", "base$D.shlb"); + MakeAlias(":mozilla:base:macbuild:base$D.shlb", "$dist_dir"); + + BuildProject(":mozilla:modules:libutil:macbuild:libutil.mcp", "libutil$D.shlb"); + MakeAlias(":mozilla:modules:libutil:macbuild:libutil$D.shlb", "$dist_dir"); + $main::DEBUG ? MakeAlias(":mozilla:modules:libutil:macbuild:libutil$D.shlb.xSYM", "$dist_dir") : 0; - BuildProject(":mozilla:htmlparser:macbuild:htmlparser.mcp", "htmlparser$D.shlb"); - $main::DEBUG ? MakeAlias(":mozilla:htmlparser:macbuild:htmlparser$D.shlb.xSYM", "$dist_dir") : 0; - - BuildProject(":mozilla:dom:macbuild:dom.mcp", "dom$D.shlb"); - $main::DEBUG ? MakeAlias(":mozilla:dom:macbuild:dom$D.shlb.xSYM", "$dist_dir") : 0; + BuildProject(":mozilla:modules:libimg:macbuild:png.mcp", "png$D.o"); + BuildProject(":mozilla:modules:libimg:macbuild:libimg.mcp", "libimg$D.shlb"); + MakeAlias(":mozilla:modules:libimg:macbuild:libimg$D.shlb", "$dist_dir"); + $main::DEBUG ? MakeAlias(":mozilla:modules:libimg:macbuild:libimg$D.shlb.xSYM", "$dist_dir") : 0; - BuildProject(":mozilla:gfx:macbuild:gfx.mcp", "gfx$D.shlb"); - $main::DEBUG ? MakeAlias(":mozilla:gfx:macbuild:gfx$D.shlb.xSYM", "$dist_dir") : 0; + #// beard: now depends on libimg. + BuildProject(":mozilla:network:macbuild:network.mcp", "NetworkModular$D.shlb"); + MakeAlias(":mozilla:network:macbuild:NetworkModular$D.shlb", "$dist_dir"); + $main::DEBUG ? MakeAlias(":mozilla:network:macbuild:NetworkModular$D.shlb", "$dist_dir") : 0; - BuildProject(":mozilla:layout:macbuild:layout.mcp", "layout$D.shlb"); - $main::DEBUG ? MakeAlias(":mozilla:layout:macbuild:layout$D.shlb.xSYM", "$dist_dir") : 0; + BuildProject(":mozilla:htmlparser:macbuild:htmlparser.mcp", "htmlparser$D.shlb"); + MakeAlias(":mozilla:htmlparser:macbuild:htmlparser$D.shlb", "$dist_dir"); + + BuildProject(":mozilla:dom:macbuild:dom.mcp", "dom$D.shlb"); + MakeAlias(":mozilla:dom:macbuild:dom$D.shlb", "$dist_dir") ; - BuildProject(":mozilla:view:macbuild:view.mcp", "view$D.shlb"); - $main::DEBUG ? MakeAlias(":mozilla:view:macbuild:view$D.shlb.xSYM", "$dist_dir") : 0; + BuildProject(":mozilla:gfx:macbuild:gfx.mcp", "gfx$D.shlb"); + MakeAlias(":mozilla:gfx:macbuild:gfx$D.shlb", "$dist_dir"); + + BuildProject(":mozilla:layout:macbuild:layout.mcp", "layout$D.shlb"); + MakeAlias(":mozilla:layout:macbuild:layout$D.shlb", "$dist_dir"); + + BuildProject(":mozilla:view:macbuild:view.mcp", "view$D.shlb"); + MakeAlias(":mozilla:view:macbuild:view$D.shlb", "$dist_dir"); + $main::DEBUG ? MakeAlias(":mozilla:view:macbuild:view$D.shlb.xSYM", "$dist_dir") : 0; - BuildProject(":mozilla:widget:macbuild:widget.mcp", "widget$D.shlb"); - $main::DEBUG ? MakeAlias(":mozilla:widget:macbuild:widget$D.shlb.xSYM", "$dist_dir") : 0; + #// PowerPlant now used by widget, etc. + BuildProject(":mozilla:lib:mac:PowerPlant:PowerPlant.mcp", "PowerPlant$D.shlb"); + MakeAlias(":mozilla:lib:mac:PowerPlant:PowerPlant$D.shlb", "$dist_dir"); - BuildProject(":mozilla:webshell:macbuild:webshell.mcp", "webshell$D.shlb"); - $main::DEBUG ? MakeAlias(":mozilla:webshell:macbuild:webshell$D.shlb.xSYM", "$dist_dir") : 0; - } - else - { - BuildProject(":mozilla:base:macbuild:base.mcp", "base$D.o"); - BuildProject(":mozilla:htmlparser:macbuild:htmlparser.mcp", "htmlparser$D.o"); - BuildProject(":mozilla:dom:macbuild:dom.mcp", "dom$D.o"); - BuildProject(":mozilla:gfx:macbuild:gfx.mcp", "gfx$D.o"); - BuildProject(":mozilla:layout:macbuild:layout.mcp", "layout$D.o"); - BuildProject(":mozilla:view:macbuild:view.mcp", "view$D.o"); - BuildProject(":mozilla:widget:macbuild:widget.mcp", "widget$D.o"); - BuildProject(":mozilla:webshell:macbuild:webshell.mcp", "webshell$D.o"); - } - - BuildProject(":mozilla:webshell:tests:viewer:mac:viewer.mcp", "viewer$D"); - BuildProject(":mozilla:xpfe:macbuild:xpfeviewer.mcp", "xpfeViewer$D"); + BuildProject(":mozilla:widget:macbuild:widget.mcp", "widget$D.shlb"); + MakeAlias(":mozilla:widget:macbuild:widget$D.shlb", "$dist_dir"); + + BuildProject(":mozilla:webshell:macbuild:webshell.mcp", "webshell$D.shlb"); + MakeAlias(":mozilla:webshell:macbuild:webshell$D.shlb", "$dist_dir"); + + BuildProject(":mozilla:webshell:tests:viewer:mac:viewer.mcp", "viewer$D"); + BuildProject(":mozilla:xpfe:macbuild:xpfeviewer.mcp", "xpfeViewer$D"); } diff --git a/mozilla/cmd/macfe/utility/xp_file_mac.cp b/mozilla/cmd/macfe/utility/xp_file_mac.cp index 4556694c926..c0aa77bbd85 100644 --- a/mozilla/cmd/macfe/utility/xp_file_mac.cp +++ b/mozilla/cmd/macfe/utility/xp_file_mac.cp @@ -31,7 +31,8 @@ #include "FSpCompat.h" #include "FileCopy.h" #include "PascalString.h" -#include "Files.h" +#include +#include #include #include "cstring.h" diff --git a/mozilla/dom/macbuild/dom.mcp b/mozilla/dom/macbuild/dom.mcp index bc46c047b37209daf13395b274614a83df7dd830..e08d8cb361ee7fdfbca7f6de9b44ceeab1ef0827 100644 GIT binary patch delta 16159 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 AtN;K2 delta 10571 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 YpS^sDTIBvw@apJ>y9>j&Y|-QY1854u{Qv*} diff --git a/mozilla/dom/src/build/nsDOMFactory.cpp b/mozilla/dom/src/build/nsDOMFactory.cpp index e07d4c2fd1e..f2ace3f306f 100644 --- a/mozilla/dom/src/build/nsDOMFactory.cpp +++ b/mozilla/dom/src/build/nsDOMFactory.cpp @@ -660,10 +660,10 @@ nsresult nsDOMFactory::LockFactory(PRBool aLock) } // return the proper factory to the caller -#ifdef XP_MAC +#if defined(XP_MAC) && defined(MAC_STATIC) extern "C" NS_DOM nsresult NSGetFactory_DOM_DLL(const nsCID &aClass, nsIFactory **aFactory) #else -extern "C" NS_DOM nsresult NSGetFactory(const nsCID &aClass, nsIFactory **aFactory) +extern "C" NS_DOM NS_EXPORT_(nsresult) NSGetFactory(const nsCID &aClass, nsIFactory **aFactory) #endif { if (nsnull == aFactory) { diff --git a/mozilla/gfx/macbuild/GFXSharedDebugPrefix.h b/mozilla/gfx/macbuild/GFXSharedDebugPrefix.h index c217a4f93fc..e03bec4fbab 100644 --- a/mozilla/gfx/macbuild/GFXSharedDebugPrefix.h +++ b/mozilla/gfx/macbuild/GFXSharedDebugPrefix.h @@ -16,6 +16,6 @@ * Reserved. */ -#define GFX_SHARED 1 +#define _IMPL_NS_GFX 1 #include "MacPrefix_debug.h" \ No newline at end of file diff --git a/mozilla/gfx/macbuild/GFXSharedPrefix.h b/mozilla/gfx/macbuild/GFXSharedPrefix.h index c7152329892..2e4f7799227 100644 --- a/mozilla/gfx/macbuild/GFXSharedPrefix.h +++ b/mozilla/gfx/macbuild/GFXSharedPrefix.h @@ -16,6 +16,6 @@ * Reserved. */ -#define GFX_SHARED 1 +#define _IMPL_NS_GFX 1 -#include "MacPrefix.h" \ No newline at end of file +#include "MacSharedPrefix.h" diff --git a/mozilla/gfx/macbuild/gfx.mcp b/mozilla/gfx/macbuild/gfx.mcp index e077ce0a611b8e9a4fcf3e6f96af4ae648dda45c..24a5826a350fe294e3a05f2282c2b47b5b6f7b78 100644 GIT binary patch delta 9289 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 delta 6926 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 E16eLwZ2$lO diff --git a/mozilla/gfx/src/mac/nsFontMetricsMac.cpp b/mozilla/gfx/src/mac/nsFontMetricsMac.cpp index a35e35c02bd..23414d336a6 100644 --- a/mozilla/gfx/src/mac/nsFontMetricsMac.cpp +++ b/mozilla/gfx/src/mac/nsFontMetricsMac.cpp @@ -179,7 +179,7 @@ NS_IMETHODIMP nsFontMetricsMac :: GetFontHandle(nsFontHandle &aHandle) //------------------------------------------------------------------------ -void nsFontMetricsMac :: SetFont(const nsFont& aFont, nsIDeviceContext* aContext) +NS_GFX void nsFontMetricsMac :: SetFont(const nsFont& aFont, nsIDeviceContext* aContext) { short fontNum; //ĄTODO?: This is not very efficient. Look in nsDeviceContextMac::GetMacFontNumber() diff --git a/mozilla/gfx/src/mac/nsGfxFactoryMac.cpp b/mozilla/gfx/src/mac/nsGfxFactoryMac.cpp index e2322a6c2e9..a232444bae8 100644 --- a/mozilla/gfx/src/mac/nsGfxFactoryMac.cpp +++ b/mozilla/gfx/src/mac/nsGfxFactoryMac.cpp @@ -160,12 +160,10 @@ nsresult nsGfxFactoryMac::LockFactory(PRBool aLock) } // return the proper factory to the caller -#ifdef MAC_STATIC -extern "C" NS_GFXNONXP nsresult NSGetFactory_GFXWIN_DLL(const nsCID &aClass, nsIFactory **aFactory) -#elif defined(MAC_SHARED) -#pragma export on -extern "C" NS_GFXNONXP nsresult NSGetFactory(const nsCID &aClass, nsIFactory **aFactory) -#pragma export off +#if defined(XP_MAC) && defined(MAC_STATIC) +extern "C" NS_GFX nsresult NSGetFactory_GFXWIN_DLL(const nsCID &aClass, nsIFactory **aFactory) +#else +extern "C" NS_GFX nsresult NSGetFactory(const nsCID &aClass, nsIFactory **aFactory) #endif { if (nsnull == aFactory) { diff --git a/mozilla/htmlparser/macbuild/htmlparser.mcp b/mozilla/htmlparser/macbuild/htmlparser.mcp index b09981ee3f9fce5ad546c581f5ca0f18417cdbc9..366a4f01a1e4f18350587493b627c37e22926101 100644 GIT binary patch delta 11728 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 delta 2406 zcmY+Fdu&rx9LLYO?Oj*eZY}G&Cv@Yn@fcf26H*XeA`}AR$(ygoV6GbQsIBWV=*~M&zFa zs-orWeq1WsZk^(WcXar|{c>SDcgh~?`X9ZrQ;A;ot<`Rb!JrxOiR`{Dnf+|7F*Zyl zv8>biCEI9oZg)*)%{CjmX6s}2t47vt%VFmDI1^@+^NPXoJ=CP-gei_yp@4~b;*ETA z5v_L&!E_mjOvF&cVE$9Ov`5p|Li^xNaLgXWcBgP_R zEw&(9QH$}>T5Jh~p=8kqPzyxi!e3%S zrF-^0Q>L&*6>_uU_@vRQ>cN!nunVg)*soJZt7D-iNG0YKb{ivQJGsPV%H5ID-+%X> z$PeGAtZSLeOrunLB&e;p zQ#+bE)RJ<)PnIV7>tTcI4u`xs4h1Dcb8%z7uge$U=v&!WB9%x3*D zB}N_%)+`T91|kzNgsrV#i?Y6MF;cOkyPHylotTs@ybaw(eY-^-SIZM&851M+yY*vJ0b9LT}f^Ouh5+^c%`l+j|cbbPJWZyJY83kJHV@S zrv>~8T}hq*9?+c&;4^e3c_R2s-N{_(Hb1E=$&(snE6LNq zpVl46Dz~{>SCS6`pQ}4H;PZ4PxqQXW*PV9o+Ng3f8cef|0bl;86FKpXtTUJqi)Wt? z+$04KP#)bPGjS~VgHb$tCuT(CVj!~%xVM<*Dw$!vqL{i;hlS-UtG2PJ0UwGR7$Dj_ zVcrI=OswfRR!sXS4fFOA>WWEdM28*xn-V%r@l|t2DaI(@isO`1Ti>|k|6^2r&Ap|V zYk2`*QA&d;S%eH|u5GH9A0>HIqs`IGX&KFpapu9;#>bV>Y6BhC%|m6>RpI;`2i;WP z@WNu^J}>89soiBAh2P|epE0Ny`KqWt4Zj1l{#!pp9*p{aejDSZT0evSO1saPf&3MX zTh{Q*a_raQ=LO}ol+NWXV=f;`h8$_6yvH`LJFik#pIL zkfi_=P@rS{*Z%-9o+#f%e^TK11@07a^i`^vN~K zG0>87cni34X*J*J$9k^3!O!?<3H^=Rr_m8$|A^?4FU;?EaIR{=p;?{bkp4d#H9)P-Y5#D zx$1qRj^KjK-~!T)aU7rGdyF$~2%_WYjDnz|jH5COGoq6B{Z)UHPLSuEciuZ^&O1{{ z-S7Lqs#{g}um9HF`m^mZ4<3u^%$qECT`Yt!gxuu;B!kBa`S^`Md#%gW0<;MsM+v$8 zMj;=1M2MK1pk4X+vILoIti~?ug&3JA#3-o7>OjY!WO)I0m?cE^b!Y>syuey9K&D>FHI?UgdE$Ict4AVo_-YcI&ZA7gyP<9Bs~)9%-Iq zwF8~DwmRDC>}b^4r>NY~R^RTZKP&rPQ`IgNj@rsa_C-#gud%J(+h?cBcAvXFY#eHj zb4EvMv8(pnVOKf4wT>1VmAkPe{2)E*+a*w>LE{e0f!@{!tieSF$$XXRJ()uCyZsROhy$7N7UJla|++{wW zJJ5eV_vl)xw2yDXO1?ef)CkXYRoH$#W1Oqbv$K1AOYEt#^Mqem83mwuCNIi=~HOup25-B!glWE#W0;*`RK5;^7FYetm?PmiYtHpy-@4}=EA4u&GsAZ0_{*^mGP{RG_1CBOQirDvYljsuWLD4~>yp+tCuB_U zzR@H5`O{LdN`8Tilr{#NlZuM8V&ET{*8u;-9ILeWGxJ-3e_?(%@D%gMfPZEFBJgj_ zj{v`9{tfW7@GC2wt`uMCf^=H@zh*ugNEMONmtk{8QIYNib~E3Ei-M*i9aoglbs_yV zaD(f742~-gr3`42E)~QFqkl=)2{H=6qnP6&BBPl%gU2wZ&SIJG0FPt-AK?9%9|4bN zjseU5nr99HPhgJAq)Y^-^e;2maG@ZRIp$Sjw3LR>QD!mU2cFIRBk-Y`XW?k2ojImY z<}fb-N9UBXmV@UpUkg4=@dY9afg^`=!PDR)m>&io$sF;3y9SlAFev(6!`<>524X~zK47a`F+?F zP?$@aLz+68GMXwiMHCm99yum>bn+TwP2 zyiQM82R)*$RM%@_iPjiK=%YYO;h#bR<>@oM(9+K_B`|I}DvW+GvjVS#FIV>)X z3!(dhZ4IksltB&G1dle(kdekpaC5+!>_BI{*%^~DG}6G$zeF5MG{8w25b(F9--W3Z z%5lhqF?()Wa7}mjj-A0%F{uW%kl0_J2qHt@vYXR8GELv+RMXvI&(!Vernqqe3Vw4| zd|GCT-e*yR!{e;0@;FyEuFY>y_pl9S>*h>z=I!}`&WHjUoN7dM6>2D&hE4w{q(_R$ z$WxHZf>VEH8WS%8or-)Z@*L!u$R)@{$n%hABVUX>33)p5RJ1eDN*W-G20C;MqpJme9S)vZ)c9hmL3B+1vdK3hXXai93xtS)S3%F`cIlDbMW#0!Jmuzcfgqu~*B7CM>f#NCbjIPxCk;QwIs3EE96f<@etsGY zcNyQ;D5JPMn(bJ|{*2s??BseetPf>7iS1nAJov{L$ihy>QH*0WijOoJ+>!VT+i{G# zo)zCLbIZ^iwTouu_Ze##+ZcU}YZ=!uu4lYap|z%24)xF0nqlLzeQXynMlfE&<-cJ3 zCF8FcUu1lV@nyzW7++=F&-j`~zdXRgLB`h^4>7*M_$K488Q)_34ddI4?=b$B@pp_o z$?`q6b&&WY8|G+i}yZoGNI*T~! zr<(J%kR_MaI!DkPs3GIUm?a5;y${F3d{j9)Qw*voI&?gqwDcnT$0}XN2`MFjC!~(>;so z26tJPQZ=CRJ#Z%5YEEDmu|1DbEi%wAW_uFjbVB%V0b`}j`+8?vb@jwHZ_&cVrBy|> z#>VvV9mS=MZH|`4gmuojiz~`2v7*0=W42C?l{sBs+$)DeZQ4L3`1>OEF0jV;jW2pieiaw)qyelDL(2_Cg=Gw7gmzU!c$ z2y|QwkryCiZjEWkbCG8u7bDL{E=0Zvc_MNt@{HhN+XJfG z3%|2l#NBxwD#}q*f&6zpTy#x1C0|aEPKt)X)}v=+eB^Y*!OAcj_gO|mm^~YIQ$2W=>h@%KZAqm4S{S{pQVHXfJDZyF5OpHQ)-F8b1qxH?OK> zPJWZS{`?i1JS+2&109!I+b)+8*3mWc4r~6EvNM8S4Fo!-ksKS*gw6vUnb8$X?KF-+ zM^^OWk}DSHw_?xP);)eX*V=il?2JO6BHv*Ju90|^)^|w#X-JgvYw@%~FLA>f%!xSP zk@W1=VQlQbdI(5UN4`r4lI_j>h=7| zce1U$Yvst0amSIfe5iHH5;=kkN*J@O!&gf;8G()z8t4Sg2V0+BF7reD^g4NAsLtM{ zGS0HwbhES*1m0;N@mOn@O_mwtqggZ^&*>cpS>GG3LWU2B2z87 zRSphx+HI*)nmL1MaQZy1HBL{nm!o%FQdyhN z>1lKN>?Ld6EiR8bXNIDIH)RCvf<;-%0S4acpgH}3Sh1+Agc{9n@cGOsmf!l*OVzoYRK~r6G!T9{~1$C}kZ-K+zSP5u zl~38>>Y^6&|KNOkJsK-k=$19j`h0_o?b>`ox-$Nu?k37{chPR`-XQHUbYBE(wX*Q4 zQvOB=yJ+?L`n<}^fu2Zu3s%6eG!A+s>HI=7R5TI#C~n7wmy@C7%D_h^ZYNw{{t+H+ z{M=A@f%+UW3LP|J-4AQ1fo_q;wz|E2^xJR2E%(K(zIqHayuPHTF>WU`7{bRc!~5;M zRpnlvNbukNdnmNVBgwVc#M2u-x#7hdz;}@<#1^`DD^_~P$M_bYJ{tk#E7)-Th5f+y zA|q|T=xqHB3+O%Zi%J&qL10X)qov2A>Q%95yB-Div^v~91!@oZ2*BRz^OCOa?UgK^ z93VsvbX7l0|7IgRPz9YHH^X#!BkUyT@LZTK#XIQVc%#+V;_6i(>M=JWgN|4fCF13^ z*pG|@zUWCIQg$o7@Q3htAw1ik}O z+C=qhw7z^Z_^(M7qJcIkS|9ZXdhEsb9!d=<*u?3A;j6%@VWb8c1Rq&RJUBl1PE?&l z5~L$=p`kl2d_DofdrB4!V}PNUP&Z3TmmBNw(RnV%M3`=SOi!_ji5^|Z+p%AgpM#>O zKt^o{i-{gxG|>kJj)}r2zz?gA#m6{uj)|g)UC@qb{oX}AG0{*0?R}-o40tva6I=b8 zARg5_Y`T_%Vx=fNvJBcWt?!_(Cma)H)B%ErQd1{3Iwp#?($suND)jx>=$I&cnWm3| z8EG?}(i{_sC%})B|B;$#E_6^7zStj}7oDarz&R#XV$l$vAR{%M#)e~J(jjna3~4hB zfMa4Q)upus=_lxgW1?u)HVB`RDnwud_0K`E^KvMNNJ_U+uy9Ot+rU2~72nydvoTQ= zaWjO^l`J}`BYgnXuf2lKC|-~{yRp#+P+f%YNb08(kOHyTr~~ke>a9~zkOToKkcy3V zU3KkO(6P`^ItmZTC>6cc&+G1v@pY2(9^a4gN0}(S+_&$P3Y$v{(I?mdy4M(t|chQR6B?OxahC-Gl+-K?>d^JptGx= zyAyhruHU>7$gbY?Fmwt$q-HwJbgWe0jDrgO_M>?l^aQt`me}f+M^Ipgfb_@%;M&zI zj2+-PT7L^GWXRPIC4%QFUCuwyw6-_;^mTy2GrS;`cpLKQho$yNNM<;hbk8<|( zqsyR=flYni_7*nm>Qz|(>8GodXlCSgY_?lll8j-w{rDHBt+nn6<@y(??iO!;1Ab5G zZt=LihOqW08(E2R#=<@BX}Q8kLLeEbR>T0~UzRM{+x3g_Ge4X#uIKu<=cbCa$m^)D z@RVHRba?89<8ci?@^m}tiAzL`&%b!0i0c`F+QCXmHge=dYf`c?AyJJKa%)8DC)-Bn ZT5FOGyFRVf<337=@6j&Sj$~ube*vK*C%6Cr delta 14679 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 +#ifndef __OSUTILS__ +#include +#endif +#ifndef __TOOLUTILS__ +#include +#endif + // Because serial port and SLIP conflict with ReadXPram calls, // we cache the call here // The symptoms are the @@ -41,11 +48,11 @@ long GMTDelta(); void MyReadLocation(MachineLocation * loc) { static MachineLocation storedLoc; // InsideMac, OSUtilities, page 4-20 - static Boolean didReadLocation = FALSE; + static Boolean didReadLocation = false; if (!didReadLocation) { ReadLocation(&storedLoc); - didReadLocation = TRUE; + didReadLocation = true; } *loc = storedLoc; } diff --git a/mozilla/lib/xp/xp_stub.c b/mozilla/lib/xp/xp_stub.c index d85cffbf7e2..37cf00c6f5d 100644 --- a/mozilla/lib/xp/xp_stub.c +++ b/mozilla/lib/xp/xp_stub.c @@ -31,10 +31,12 @@ NOT_NULL (const char *x) #endif +#ifdef DEBUG void XP_AssertAtLine( char *pFileName, int iLine ) { PR_Assert("XP Assert", pFileName, iLine); } +#endif /* XP_GetString * diff --git a/mozilla/modules/libimg/macbuild/libimg.mcp b/mozilla/modules/libimg/macbuild/libimg.mcp index d2514222f1be878f40c6e38dbf596b4e354d1431..a163391d172a582f6a22444fe24816b2a74562c8 100644 GIT binary patch delta 11007 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 delta 8270 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 diff --git a/mozilla/modules/libimg/src/xpcompat.cpp b/mozilla/modules/libimg/src/xpcompat.cpp index a5c5008a91e..24502e86f94 100644 --- a/mozilla/modules/libimg/src/xpcompat.cpp +++ b/mozilla/modules/libimg/src/xpcompat.cpp @@ -25,6 +25,7 @@ * of the XP_ library. */ #include "xpcompat.h" +#include "xp_mcom.h" #include /* BSDI did not have this header and we do not need it here. -slamm */ /* #include */ @@ -41,7 +42,6 @@ extern ilISystemServices *il_ss; #include #endif /* XP_PC */ -#ifndef XP_MAC PR_BEGIN_EXTERN_C int MK_UNABLE_TO_LOCATE_FILE = -1; int MK_OUT_OF_MEMORY = -2; @@ -68,7 +68,6 @@ int XP_MSG_COMMENT = -25; int XP_MSG_UNKNOWN = -26; int XP_MSG_COMPRESS_REMOVE = -27; PR_END_EXTERN_C -#endif /* XP_MAC */ char *XP_GetString(int i) { @@ -120,8 +119,8 @@ static void swap(char *p, char *q, unsigned int width); void XP_QSORT ( void *base, - unsigned num, - unsigned width, + size_t num, + size_t width, int ( *comp)(const void *, const void *) ) { @@ -369,10 +368,60 @@ static void swap ( #endif /* SOLARIS or XP_MAC */ +#ifdef XP_MAC +#include + +static void MyReadLocation(MachineLocation * loc) +{ + static MachineLocation storedLoc; // InsideMac, OSUtilities, page 4-20 + static Boolean didReadLocation = FALSE; + if (!didReadLocation) + { + ReadLocation(&storedLoc); + didReadLocation = TRUE; + } + *loc = storedLoc; +} + +// current local time = GMTDelta() + GMT +// GMT = local time - GMTDelta() +static long GMTDelta() +{ + MachineLocation loc; + long gmtDelta; + + MyReadLocation(&loc); + gmtDelta = loc.u.gmtDelta & 0x00FFFFFF; + if ((gmtDelta & 0x00800000) != 0) + gmtDelta |= 0xFF000000; + return gmtDelta; +} + +// This routine simulates stdclib time(), time in seconds since 1.1.1970 +// The time is in GMT +time_t GetTimeMac() +{ + unsigned long maclocal; + // Get Mac local time + GetDateTime(&maclocal); + // Get Mac GMT + maclocal -= GMTDelta(); + // return unix GMT + return (maclocal - UNIXMINUSMACTIME); +} + +// Returns the GMT times +time_t Mactime(time_t *timer) +{ + time_t t = GetTimeMac(); + if (timer != NULL) + *timer = t; + return t; +} +#endif /* XP_MAC */ /* Allocate a new copy of a block of binary data, and returns it */ -#ifndef XP_MAC char * NET_BACopy (char **destination, const char *source, size_t length) { @@ -395,7 +444,6 @@ NET_BACopy (char **destination, const char *source, size_t length) } return *destination; } -#endif /* XP_MAC */ /* binary block Allocate and Concatenate * @@ -403,7 +451,6 @@ NET_BACopy (char **destination, const char *source, size_t length) * source_length is the length of the block being added to the * destination block */ -#ifndef XP_MAC char * NET_BACat (char **destination, size_t destination_length, @@ -433,11 +480,9 @@ NET_BACat (char **destination, return *destination; } -#endif /* XP_MAC */ /* Very similar to strdup except it free's too */ -#ifndef XP_MAC char * NET_SACopy (char **destination, const char *source) { @@ -460,11 +505,9 @@ NET_SACopy (char **destination, const char *source) } return *destination; } -#endif /* XP_MAC */ /* Again like strdup but it concatinates and free's and uses Realloc */ -#ifndef XP_MAC char * NET_SACat (char **destination, const char *source) { @@ -490,7 +533,6 @@ NET_SACat (char **destination, const char *source) } return *destination; } -#endif /* XP_MAC */ #if 0 #include @@ -770,14 +812,14 @@ static void wfe_ProcessTimeouts(DWORD dwNow) dwSyncHack = 0; } #else -void * +NS_EXPORT void * FE_SetTimeout(TimeoutCallbackFunction func, void * closure, uint32 msecs) { return il_ss->SetTimeout((ilTimeoutCallbackFunction)func, closure, msecs); } -void +NS_EXPORT void FE_ClearTimeout(void *timer_id) { il_ss->ClearTimeout(timer_id); diff --git a/mozilla/modules/libpref/macbuild/libpref.mcp b/mozilla/modules/libpref/macbuild/libpref.mcp index 1e70636d7adc3ddcc6027587838589db0d1e2d02..c13104103da8426f05827f2f107c3133a99bf5cb 100644 GIT binary patch delta 721 zcmZ9J&ubGw6vyZ7=9kf=Nl3Ps_#;xQrPRH8=)t7Fu-Gjs>P1jmjY&*PYLb!)9=4%D zY0}0xme3-k;6V_fZ3eSN@Ze4T1FH0(_Tt4~g`fvLtZ&k!pbtL#zVFA(yqT@lOtqS6 z^&7Oe5(0igS`36Z2x^RH$|%sxpGcQKW&E6ZL?L#{*n%lXF_?C8A&dAy3P^^&iuq35 zMU_M5kSvl!638r)$L9JfGYVvZE{Q(cYxb~9;uYr}-Z?Nh)GyMPZXb`bJJFW=Ac$0V zckIWUTF((O-SBfeJps?)5y~ZQTWI+E4PR{d2lT0@9dh)w$A1h5_|I(h7|32_KG2C((y!0iC>=_8%gwqMkm8^ zGBP$w{w>IK>%~#JZ2dqlD>k}(<|k9*J-{|1n?TzHZ68jUK~!X#TEznriUg8GvdAow zCn76atw7&gIL}~wUUk{u;Vtkc-0a)@=NE&wnCtuVZVQe&&x@rW$Dz$w;59D&Y&+5o zY+_LnwXzK9+s22@F24oOSlDeWeR%>?&F&3B`}zzP4PL>8N3D;iCX(p+b2LnNTPm-C rBnX?Dwg$fp!p)V^N);rp$j5Wwf+%`CplPwN_OS{jfX7;T9qzziO-r}t delta 612 zcmYk(&1(}u7zXfpcSCo(T5U^qB_C=n3PnoEMHDI++gdHA5HC^?rJ{$VHBb^E7Cgk( zC^k)XeW8n9>a9V9*bHW);L(4f)gBZt9{fTG^`K~c(j?%pzxjA(mVKG6R@Ah}2h`&?%K`VGA8K1$%ZWvI}L7t0Kl}IbpFad@nq#y&g zU=Fgd0E>`^CAbd{z=nsw{8$a}ux85h>ZPuBB+1dS$SI9qdjs`Vwz2x?-AfwRynQ}o zne7bUX^#2EnXoy=w&~NGDf3hF5O0`1Up+wWxln&k=tk(jo(=B_4qInBghqn4AKU{U zwT9(etN*avdGaFJQJv#Mel0z5PKZcQ9$5ZGe0yY%mcD$oR(tmb!EfSl$$gh zxRWbT)cLYXeXSGgiu?5$J@WXc2^Cio*Jo1A$}!ZN((SCQk)=$(blo-j=~0wkr&uP- duWVws6EDOu;zzWa^4a}RCWmOtO;_k9{R3WFp*a8m diff --git a/mozilla/modules/libpref/src/mac/MacPrefUtils.cpp b/mozilla/modules/libpref/src/mac/MacPrefUtils.cpp index 82458b63ccc..fb196ae73af 100644 --- a/mozilla/modules/libpref/src/mac/MacPrefUtils.cpp +++ b/mozilla/modules/libpref/src/mac/MacPrefUtils.cpp @@ -26,7 +26,9 @@ #include #include "prmem.h" +#include "plstr.h" #include "FullPath.h" +#include "net.h" // Returns a full pathname to the given file // Returned value is allocated with XP_ALLOC, and must be freed with XP_FREE @@ -175,8 +177,8 @@ static char* encodeMacPath(char* inPath, Boolean prependSlash) if (newPath != NULL) { swapSlashColon(newPath); - // finalPath = NET_Escape(newPath, URL_PATH); - // XP_FREE(newPath); + finalPath = NET_Escape(newPath, URL_PATH); + XP_FREE(newPath); } PR_Free( inPath ); @@ -201,7 +203,7 @@ static char* macPathFromUnixPath(const char* unixPath) else if (strchr(src, '/')) // Ą partial path, and not just a leaf name *dst++ = ':'; strcpy(dst, src); - // NET_UnEscape(dst); // Hex Decode + NET_UnEscape(dst); // Hex Decode swapSlashColon(dst); } return result; @@ -275,3 +277,137 @@ Boolean FileExists(const FSSpec& fsSpec) return (err == noErr); } + + +// beard: brought over from mkparse.c to break dependency. + +/* encode illegal characters into % escaped hex codes. + * + * mallocs and returns a string that must be freed + */ +static int netCharType[256] = +/* Bit 0 xalpha -- the alphas +** Bit 1 xpalpha -- as xalpha but +** converts spaces to plus and plus to %20 +** Bit 3 ... path -- as xalphas but doesn't escape '/' +*/ + /* 0 1 2 3 4 5 6 7 8 9 A B C D E F */ + { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x */ + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 1x */ + 0,0,0,0,0,0,0,0,0,0,7,4,0,7,7,4, /* 2x !"#$%&'()*+,-./ */ + 7,7,7,7,7,7,7,7,7,7,0,0,0,0,0,0, /* 3x 0123456789:;<=>? */ + 0,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, /* 4x @ABCDEFGHIJKLMNO */ + /* bits for '@' changed from 7 to 0 so '@' can be escaped */ + /* in usernames and passwords in publishing. */ + 7,7,7,7,7,7,7,7,7,7,7,0,0,0,0,7, /* 5X PQRSTUVWXYZ[\]^_ */ + 0,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, /* 6x `abcdefghijklmno */ + 7,7,7,7,7,7,7,7,7,7,7,0,0,0,0,0, /* 7X pqrstuvwxyz{\}~ DEL */ + 0, }; + +#define HEX_ESCAPE '%' + +#define IS_OK(C) (netCharType[((unsigned int) (C))] & (mask)) + +PUBLIC char * +NET_Escape (const char * str, int mask) +{ + if(!str) + return NULL; + return NET_EscapeBytes (str, (int32)PL_strlen(str), mask, NULL); +} + +PUBLIC char * +NET_EscapeBytes (const char * str, int32 len, int mask, int32 * out_len) +{ + register const unsigned char *src; + register unsigned char *dst; + char *result; + int32 i, extra = 0; + char *hexChars = "0123456789ABCDEF"; + + if(!str) + return(0); + + src = (unsigned char *) str; + for(i = 0; i < len; i++) + { + if (!IS_OK(src[i])) + extra+=2; /* the escape, plus an extra byte for each nibble */ + } + + if(!(result = (char *) PR_Malloc(len + extra + 1))) + return(0); + + dst = (unsigned char *) result; + for(i = 0; i < len; i++) + { + unsigned char c = src[i]; + if (IS_OK(c)) + { + *dst++ = c; + } + else if(mask == URL_XPALPHAS && c == ' ') + { + *dst++ = '+'; /* convert spaces to pluses */ + } + else + { + *dst++ = HEX_ESCAPE; + *dst++ = hexChars[c >> 4]; /* high nibble */ + *dst++ = hexChars[c & 0x0f]; /* low nibble */ + } + } + + *dst = '\0'; /* tack on eos */ + if(out_len) + *out_len = dst - (unsigned char *) result; + return result; +} + +/* decode % escaped hex codes into character values + */ +#define UNHEX(C) \ + ((C >= '0' && C <= '9') ? C - '0' : \ + ((C >= 'A' && C <= 'F') ? C - 'A' + 10 : \ + ((C >= 'a' && C <= 'f') ? C - 'a' + 10 : 0))) + +PUBLIC int +NET_UnEscapeCnt (char * str) +{ + register char *src = str; + register char *dst = str; + + while(*src) + if (*src != HEX_ESCAPE) + { + *dst++ = *src++; + } + else + { + src++; /* walk over escape */ + if (*src) + { + *dst = UNHEX(*src) << 4; + src++; + } + if (*src) + { + *dst = (*dst + UNHEX(*src)); + src++; + } + dst++; + } + + *dst = 0; + + return (int)(dst - str); + +} /* NET_UnEscapeCnt */ + +PUBLIC char * +NET_UnEscape(char * str) +{ + (void)NET_UnEscapeCnt(str); + + return str; +} diff --git a/mozilla/modules/libpref/src/mac/macpref.cp b/mozilla/modules/libpref/src/mac/macpref.cp index 8ddf7795f5b..32c1174ce93 100644 --- a/mozilla/modules/libpref/src/mac/macpref.cp +++ b/mozilla/modules/libpref/src/mac/macpref.cp @@ -20,13 +20,26 @@ #include "prefapi.h" #include "jsapi.h" #include "prlink.h" + +#if 0 +// beard these are old world APIs that must be excised in the new world. +#include "LString.h" #include "ufilemgr.h" #include "uprefd.h" -#include "LString.h" +#endif -#include +#include "MacPrefUtils.h" + +#ifndef __RESOURCES__ #include +#endif +#ifndef __MEMORY__ #include +#endif +#ifndef __ALIASES__ +#include +#endif + /* * Mac-specific libpref routines @@ -111,7 +124,7 @@ PREF_CopyPathPref(const char *pref_name, char ** return_buffer) if (err != noErr) return PREF_ERROR; // bad alias - *return_buffer = CFileMgr::EncodedPathNameFromFSSpec(fileSpec, TRUE); + *return_buffer = EncodedPathNameFromFSSpec(fileSpec, TRUE); return PREF_NOERROR; } @@ -121,7 +134,7 @@ PREF_SetPathPref(const char *pref_name, const char *path, PRBool set_default) { FSSpec fileSpec; AliasHandle aliasH; - OSErr err = CFileMgr::FSSpecFromLocalUnixPath(path, &fileSpec); + OSErr err = FSSpecFromLocalUnixPath(path, &fileSpec); if (err != noErr) return PREF_ERROR; @@ -142,6 +155,7 @@ PREF_SetPathPref(const char *pref_name, const char *path, PRBool set_default) return result; } +#if 0 /* Looks for AutoAdminLib in Essential Files and returns FSSpec */ Boolean pref_FindAutoAdminLib(FSSpec& spec) @@ -154,10 +168,14 @@ pref_FindAutoAdminLib(FSSpec& spec) return CFileMgr::FileExists(spec); } +#endif PR_IMPLEMENT(PRBool) PREF_IsAutoAdminEnabled() { +#if 0 FSSpec spec; return (XP_Bool) pref_FindAutoAdminLib(spec); +#endif + return PR_FALSE; } diff --git a/mozilla/modules/libpref/src/nsPref.cpp b/mozilla/modules/libpref/src/nsPref.cpp index 8120fc9451f..5c5901d1904 100644 --- a/mozilla/modules/libpref/src/nsPref.cpp +++ b/mozilla/modules/libpref/src/nsPref.cpp @@ -586,11 +586,7 @@ nsresult nsPrefFactory::CreateInstance(nsISupports *aDelegate, return res; } -#ifdef XP_MAC -extern "C" NS_EXPORT nsresult NSGetFactory_PREF_DLL(const nsCID &aCID, nsIFactory **aFactory) -#else extern "C" NS_EXPORT nsresult NSGetFactory(const nsCID &aCID, nsIFactory **aFactory) -#endif { if (aFactory == NULL) { return NS_ERROR_NULL_POINTER; @@ -607,11 +603,7 @@ extern "C" NS_EXPORT nsresult NSGetFactory(const nsCID &aCID, nsIFactory **aFact return NS_NOINTERFACE; } -#ifdef XP_MAC -extern "C" NS_EXPORT PRBool NSCanUnload_PREF_DLL() -#else extern "C" NS_EXPORT PRBool NSCanUnload() -#endif { return PRBool(g_InstanceCount == 0 && g_LockCount == 0); } diff --git a/mozilla/modules/libpref/src/prefapi.c b/mozilla/modules/libpref/src/prefapi.c index 0c974f64162..05f314ca7be 100644 --- a/mozilla/modules/libpref/src/prefapi.c +++ b/mozilla/modules/libpref/src/prefapi.c @@ -2225,10 +2225,26 @@ pref_ErrorReporter(JSContext *cx, const char *message, } } +#if defined(XP_MAC) + +#include +#include + +void pref_Alert(char* msg) +{ + Str255 pmsg; + SInt16 itemHit; + pmsg[0] = strlen(msg); + BlockMoveData(msg, pmsg + 1, pmsg[0]); + StandardAlert(kAlertPlainAlert, "\pNetscape -- JS Preference Warning", pmsg, NULL, &itemHit); +} + +#else + /* Platform specific alert messages */ void pref_Alert(char* msg) { -#if defined(XP_MAC) || defined(XP_UNIX) || defined(XP_OS2) +#if defined(XP_UNIX) || defined(XP_OS2) #if defined(XP_UNIX) if ( getenv("NO_PREF_SPAM") == NULL ) #endif @@ -2239,6 +2255,7 @@ void pref_Alert(char* msg) #endif } +#endif #ifdef XP_WIN16 #define ADMNLIBNAME "adm1640.dll" diff --git a/mozilla/modules/libpref/src/prefapi.cpp b/mozilla/modules/libpref/src/prefapi.cpp index 0c974f64162..05f314ca7be 100644 --- a/mozilla/modules/libpref/src/prefapi.cpp +++ b/mozilla/modules/libpref/src/prefapi.cpp @@ -2225,10 +2225,26 @@ pref_ErrorReporter(JSContext *cx, const char *message, } } +#if defined(XP_MAC) + +#include +#include + +void pref_Alert(char* msg) +{ + Str255 pmsg; + SInt16 itemHit; + pmsg[0] = strlen(msg); + BlockMoveData(msg, pmsg + 1, pmsg[0]); + StandardAlert(kAlertPlainAlert, "\pNetscape -- JS Preference Warning", pmsg, NULL, &itemHit); +} + +#else + /* Platform specific alert messages */ void pref_Alert(char* msg) { -#if defined(XP_MAC) || defined(XP_UNIX) || defined(XP_OS2) +#if defined(XP_UNIX) || defined(XP_OS2) #if defined(XP_UNIX) if ( getenv("NO_PREF_SPAM") == NULL ) #endif @@ -2239,6 +2255,7 @@ void pref_Alert(char* msg) #endif } +#endif #ifdef XP_WIN16 #define ADMNLIBNAME "adm1640.dll" diff --git a/mozilla/network/macbuild/network.mcp b/mozilla/network/macbuild/network.mcp index 3cdd0c50265ef5e0b0a5333957f6e57c9e4d1737..3cbb2946f02ce7d7440e73466e382554a7b7bb2f 100644 GIT binary patch delta 15380 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 delta 15736 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 diff --git a/mozilla/view/src/nsViewFactory.cpp b/mozilla/view/src/nsViewFactory.cpp index 63557db3dc5..d78d56c9d03 100644 --- a/mozilla/view/src/nsViewFactory.cpp +++ b/mozilla/view/src/nsViewFactory.cpp @@ -150,12 +150,8 @@ nsresult nsViewFactory::LockFactory(PRBool aLock) } // return the proper factory to the caller -#ifdef MAC_STATIC +#if defined(XP_MAC) && defined(MAC_STATIC) extern "C" NS_VIEW nsresult NSGetFactory_VIEW_DLL(const nsCID &aClass, nsIFactory **aFactory) -#elif defined(MAC_SHARED) -#pragma export on -extern "C" NS_VIEW nsresult NSGetFactory(const nsCID &aClass, nsIFactory **aFactory) -#pragma export off #else extern "C" NS_VIEW nsresult NSGetFactory(const nsCID &aClass, nsIFactory **aFactory) #endif diff --git a/mozilla/webshell/macbuild/webshell.mcp b/mozilla/webshell/macbuild/webshell.mcp index 6a3ec3655fe696a51130ab7822e2098879defaeb..efa1fa6f645f8af6939b26a604d2e0b8904d5b19 100644 GIT binary patch delta 10116 zcmeHNi+@x_mabc&lkTLG5C}<#kOx5?3F*#*B*-f?2@#NxCJ9DHUY&QylRN|&wL#SJ zfgM5tjlhhkv*_xsf~^yETn7bbadh1s_2)Y5jxahu-O-r^R2-E-_B&N|)14rH!R*2B z);V9*ty^{K)VXy#{_KMFu3tn>sO#)(V~m9{W=v!JuK#BIo>7dA1I5l9oe*op9b}9j zVr*pzV>f~12gO|DVT&JXzxcq&ziuzI0iYD<0SsUca6d2`@Bt43iNH^QT3{crTTJ6# z%R|tF_&G1O?1#2foZ%Uk2cYfP74~Dx9w@s8T#54zKsm&i?On#~P}u=iS%Oh-{5GuM zm1B(6EWP}#FCIK*!6J2OefHj^HJ2}czBMpn0~k!hb6YZ&kVU@#~8$q}dR$>NrX zo06D?Qw9D71szWjIo1qevrZG;t{ma9E{?RI2NGt8fOUuXX>6_-?Wz^;*uJerhbcfR zKm$z&CIM4`=|Cos1C0?Yui0SDj&a)4YQ56A~*0tG-8byNh*02kO+N^G_|ry4^G zGQnJss%B4jL%qAZp|NH2y84FNz9vVraIYFaJ~&)CY&CRDBvW`MP7y~_KNM+|Cj$1G zWJ4UvI2`a#iZsNhm4^ezC$F}zS&tz10JT6JP!Eg;CIAzG6rce>$a8FBehttFzy-Vs zXa-t<4L~b^&B)V$cA!Hn$jw@H2Q)9R71##c31E-$g#c0oUj%Fi<^v^w3%Coo8@LBR zs^Iqm_W?*HybM5M;5)>+Wpfo=eahi3xWfCF#>y})z;Tb0iM`hXnZ7GM*w z8MqbL0{j@r1#Saw7x8&ntB|rdQWx(Bb^=Io+znI#D}ftXq7WP9 zAPkAbmW~UCMqdlTg2n8qHx(yjJPg(jhA0vxe^N? zCB|0K)!WkEvZVom%WP#!mMuc$U#H7iy3En#Y+cUL86>(ZgiqL3#Y)B=#l-~1j-iGe>mJUzY+SeD{ zQGNLe>1M_PjH4@>ZSsgWBU67cDNh|JojwYK$r7I}&PbgBEeFU0@`0IvOll~L@Lusu zED0P*J7Lg^B`HQN7UdJX7FW8LIJ#uE8E_@gB8{OWXRy$mH~0sSk<4Wl8+%P?1>&1J z(c%=B5+4;WFPRW=TN%Qq_)mdH(!MrmX;0mdptv!Uhqy1w6C$>~RgP@@_7E58CJr&| z*)F+&{cI!`v93CmFYyL4v*2L5#YiwPsXQYPdp3fLw7Jg&qH4xtiZP!DE>Bs+_gprt zfw5~Bg&Bre<#|nxete*y_LMQ`>@bpyFpF}`fcsU|yVDppo4VE(q~XpDHC65sNyII*xPK9JW`v0S|UbX0QTtQ*owI_n#*Z|GoVs&{nG1})rA zj}N2rrDw14N+xYtOGj%%_lS0BG?<3E-cY)vtQ>cSGG*27G`FXtp)HhL>bb>(r?^WOlt3HX&XLsRVON*OG;PH8Re=5ElJzw2@W@Fhx`!MLjVYSkaqWGEQb+YjYzYS}8wUJ)UgXYcJRjxo% zM(1qp(;82A$MA*gX>O~PakuT+MCl;+(}~t0@}+0fyyUHsA!s(Z!i^4DGs20A{DD}M zjj!%cd7oD~{0eufPUX#43(8>kBm5h3??~?kt8{dV(Si63Ga^R@qqY5TzqAfp~e39tGVKuAC=t*HI@<2g2j7a1*tNmaOR;Vj_bc zL3ky}CrC=UfSTB)9rDOnB0@H!NPm8uMNV0`0uy6~$BsYOYNR96eu`B7f_iToHgPB^ zW5As%yeZoU+zW6Ru!?n_w-blI9L!9~#D}ggEz^-ded7CtX;!>6aCpP_q&Bi(>@*D= z-PnL>;C#n+nFbDe_;%FyIAQEI4LS|&F%6vS*k04fgW)%gd>H#oVp0BuRvfTNDsF+%rgb{Bwrl+#p?7Hg z1oTd=pN8J0^^4GPj3#l@@xNQ^I7QO2n#8>tdau@Ta-^d)iQC%`0}q!5Jq+h+slN%G zj+hYlpP=KMO|l{yI=m$H>CkcRmO7p8arTxvJi>3+`aRI`B_a94(Dj5@9D}}7!-4*0G@Uc|lUS6goaLq>kmH&kd>LKKksC`p=-_^F!*#px>wU zQ_%0%`UO0nzDY=`#-c(W-mBoEkij zK9BRLK6;X)pSVi5g;YU@2u}@^K^%_Z1ddO z+1DFF$XnGj(P!}CN>k01KD(u!_{|6byZP`$NnJ7*LBE_X& zoef<6%*x4S9hrk~)EhR=*@)M;{5lH!{-XpAH^&=c;|wFj1@=H zzM(J0vBA$G+tP)deI50#F8^;6jYRS9DVF%r7$b(NK5uK5EHCZoYx6%6VYp;(_)I$! zA%UfEYh7sI+}ZXyJkC`8*svL^z?N&5W~){ZiH-IZ;x|BeXBFqk?XAQtm|=lx>}qA zu6IWsX8u0C@b@|E|6hCTfOkZ~`BeN$Qh0tUu50D>9(jFQUf-A3@6SJFp`7RwF<)d@ zC*Wwu0|L$^EYs^2E51>PVb*nS1cYY`(?d=k5M?9Ndu- z{vOEDxTggr4ilzClXu*MDNg=am=~vNmQ26389N*=qU-Upl`#fGjz6OKT|WY!tnU64 zXVP%H;#WNa{u{hWX*KnvZ#)K`;vEv(kBgpk`8VL{ zeGe%^ByzpF&yzFg)el*R!Sm8C|LFoAx3n@9hLuLlMqLYUaoQXZ+XY5FT9dv6;BQ3xMFK_a7_HN89zLn($0*X^CJ7TKRv#7B>R@_)^xWld|54LCeOt&aFz zMLf~F09#XqG;6x;22_{GYF0W4y7EiYGao>w#ezi97LhB=niF?`UnFT3frny+$&XF9 zb%QTcd|4(+8TqW~HAD%=wjqgl8<+Slue{-}_!i`gCC?(3p^Q`=ee@joC5pG>n^Z4I zbJ;rZOBL_A5v7bG*7OkVc}#+&J_Zw$TZc7WxEDP23t2T57a2vYd0rY^$jc?q5?(_o z!-zG#LXogs@xMy(Z<)ojy?ooKkoB~wO1hS;#l>9D5I+1X@aB4k@Fj>#R;t%Cgpb9B zG1v1stU3L03}XCOBdw=bx#UyqbiP7WoEzG;ta<6z;42mXHP%k0FV^h(HF#_;k_OzX z*Sa}|vJ5sF$zPs?uGjix9rTroPt8ZE*1G8*yzQtUUqcek;i4A1dD$88HN@g;nbM73 z?2q3Af0LwH!uKfSdDHz0CLSF;q0F8?N1g|2HE~-q7zP*EK1A8b)nV zYw3IcP4LZ%&&F0VMym(B26yUTz_{ZC`f;m%a%j(QknLIZeJFMRD}M~$+p0Rsi^l`> z4bC!Dv?;y_GYK1`9`Ku!;1Mq*jqnPar5;d**_*$fEwO`-R=n{?@RZ#kwaK_BPxrgG zf$x$u^H%>7igxuK$5F9SRWxo!sa)NEGvdJfx$QV~)73E!@U-SAX5TX8>i#U6aj)X% z+-AC(`QCg3e4payA?V?0nW_3`K86Z(0O1ReRZLeO3j?u9@r!m2xw=1PH+UK#in2pP zuJ%2Tt!4g%cMe(0bhXO@9!m@1OR&qdr+r_%iulvN?eU5QL$2;`{SWXMImzEJ8`ITA z2f$NsLe71Ti*mK^cNEokNSfJ+*RF2Hpv~U`qdx|(J^g3sd@F1`pT%OUm{ENf62JKy zVQeXQ9n~3kf(J-m%^Y&I@6Peyw@aE=B2lTRX1@C{2>m-Eubv@YP45KX7l**#t=iYD z#q+hR`^(97_o#~1jYF>X9V`O>6UDE=5}8qLxeOjlMUraZqN3XO=REKfBH#ScGVwTg?dn2GG5|>` z1+jMZ3+UVYF>~(E!R!3-ek%B#zErRQopTkgNOS2EijxA-r?;P*C?TJpy8n;(NUdgRZ_EuT1?5DeuFKO;^{x1>P@j zV2#-*bpolN?YB>LwE5AXtG7N5{vpNR{>6~1eFs6Azo?%35e#^G3I)Y`6HtN3CTU!U Oi;n6e?}4Yg*#7~uE8yh- delta 3625 zcmd5;dr(x@89(PNd-pE8u&4;@@>*VsEG#dpR$yVPU`S9`d=Mrvup+D&c?4|uWcf6tm(W7xV?=m0N}31k6Mmks0qa{&)f1QY{a%$s8BMf@k0?5`7|pt+mj z0~7$6Ko%f%*+3337qo6CKR^L7@iO}?{*+|{uSjsRXw_#|%rMwB#TC`VZ>8kKo2em$ z@(pTZymXi$TvHEougxjq%bATg+7e-&8;^+@lcT)LUx`Id@|$m2#Hg3W@e(CDO%9Lg z5Sz3kktuFFvCXX8KG4zM6Wr=rSRH_U#g+nop#FvOC$kGtK)y5NA}ayr164o~Pzsds^W~ll_?4{z)&c8*Rlr)H z325ex6}{R!726c;&ucA|SqN_lzO6YnrBR;R@(TATc@FqWX2NuaET5Sms|auEieUSi z&B6YTO+3Mo&fBd0+MxRb8V)SeX60HaT(^;*P4R{U7XE%`0{1u)!+}|%b_-KX*gHJ) z?4-E>9X-c==W?T^%&~08IyywHY=?}+6og-T%Ozgi%hb%^xU9>ONu;BVC~xcY&_9vj zIQNY$=HW^=?-_eI98mC^xwxZ-T_1FlNIU$Y3(6gB*iCxRv6cj_4Vw00KO_-_*N$yB z`jA~|J!5C6cBS6NWcnoN=>wN|ffD{@>IwcvL%Lj+d$wf64Xdz4>#Bt_ZrI?jbB zMbJmHw28HUq5QKIQdv4R^>;y+Qa_ZxqC7s3f~NU|EWL)NcPOu`JjY#mKjw9|+2KI4 zIPRly+)-7_LsdTBy400r!%XE4mfO?ilBp05xFRK6*d@7oI|~Q4z{t*r?G56>KIT;AsbLO!d&OV(u{nBR z;}9DY_lIU{<)Kw8h4T(oIBK{xtp-v6PwLU#O+~O+?!+-MX|!#SYcBRfL>BqHU4DJT^h~mGM!a^z%@?)o(~~2bA$cOp zL{ICRg{nO3>^zF7?_rs`Q<^%d?j7i!jpwXv0ebz}&ii{8~ke~c;K>gqCX_?gl ztj39B%O=KG(0Fk(K-=Z6&p-c6x{P~4UF6;f-C7t9%oY=+)Ewz?uK0JL+uc3Tr(cTGO)PoC2Uvgo@YTuld2x(`izFS=>Cr>RqKL2uU6>_!;t^ z^%(rMyCN`%_V0G$y54H=KZEDxMJlCM6}u&$hZ~pp4F0KKgO|G!qBe<`AeBN`S4?NqHC=Lw4FIO*tQ>7h= z%g0)nd=W#`(_&oqb0cw@UnSoT)dp|9Jsf6UWsQdFUa=s|JoKVy3!{aS2URRlzcmVV3Ip;oX=6N$5B4 zgT_-uO2VXYzkuQ0N1!tn6ngbNl#%vQtYsn~d8-^YQD1OqC$%~pU rKan%-$)k9Eunjs-TbBs;G3kI$QP;O33B9@)JfZ=itye|h7)$;qi2`DB diff --git a/mozilla/webshell/src/nsDLLFactory.cpp b/mozilla/webshell/src/nsDLLFactory.cpp index ee9c0da0940..20b2084d7f3 100644 --- a/mozilla/webshell/src/nsDLLFactory.cpp +++ b/mozilla/webshell/src/nsDLLFactory.cpp @@ -27,12 +27,8 @@ static NS_DEFINE_IID(kThrobberCID, NS_THROBBER_CID); static NS_DEFINE_IID(kWebShellCID, NS_WEB_SHELL_CID); -#ifdef MAC_STATIC +#if defined(XP_MAC) && defined(MAC_STATIC) extern "C" NS_WEB nsresult NSGetFactory_WEB_DLL(const nsCID& aClass, nsIFactory** aFactory) -#elif defined(MAC_SHARED) -#pragma export on -extern "C" NS_WEB nsresult NSGetFactory(const nsCID& aClass, nsIFactory** aFactory) -#pragma export on #else extern "C" NS_WEB nsresult NSGetFactory(const nsCID& aClass, nsIFactory** aFactory) #endif diff --git a/mozilla/webshell/tests/viewer/mac/viewer.mcp b/mozilla/webshell/tests/viewer/mac/viewer.mcp index a7cbeb5ca78fd0904e4517f6f08ccb06091dfee7..6fd137f48d94eddba0a413847721b83970a87ff0 100644 GIT binary patch delta 7027 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 KjL=~LN%{}Ya-k&v delta 6851 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 diff --git a/mozilla/webshell/tests/viewer/macToBeImplemented.cp b/mozilla/webshell/tests/viewer/macToBeImplemented.cp index d02a4f7e45a..72c8a1aec3c 100644 --- a/mozilla/webshell/tests/viewer/macToBeImplemented.cp +++ b/mozilla/webshell/tests/viewer/macToBeImplemented.cp @@ -47,3 +47,79 @@ char * XP_FileReadLine(char * dest, int32 bufferSize, XP_File file) return NULL; } +#include "il_strm.h" + +/* Given the first few bytes of a stream, identify the image format */ +static int +il_type(int suspected_type, const char *buf, int32 len) +{ + int i; + + if (len >= 4 && !strncmp(buf, "GIF8", 4)) + { + return IL_GIF; + } + + /* for PNG */ + if (len >= 4 && ((unsigned char)buf[0]==0x89 && + (unsigned char)buf[1]==0x50 && + (unsigned char)buf[2]==0x4E && + (unsigned char)buf[3]==0x47)) + { + return IL_PNG; + } + + + /* JFIF files start with SOI APP0 but older files can start with SOI DQT + * so we test for SOI followed by any marker, i.e. FF D8 FF + * this will also work for SPIFF JPEG files if they appear in the future. + * + * (JFIF is 0XFF 0XD8 0XFF 0XE0 0X4A 0X46 0X49 0X46 0X00) + */ + if (len >= 3 && + ((unsigned char)buf[0])==0xFF && + ((unsigned char)buf[1])==0xD8 && + ((unsigned char)buf[2])==0xFF) + { + return IL_JPEG; + } + + /* no simple test for XBM vs, say, XPM so punt for now */ + if (len >= 8 && !strncmp(buf, "#define ", 8) ) + { + /* Don't contradict the given type, since this ID isn't definitive */ + if ((suspected_type == IL_UNKNOWN) || (suspected_type == IL_XBM)) + return IL_XBM; + } + + if (len < 35) + { + /* ILTRACE(1,("il: too few bytes to determine type")); */ + return suspected_type; + } + + /* all the servers return different formats so root around */ + for (i=0; i<28; i++) + { + if (!strncmp(&buf[i], "Not Fou", 7)) + return IL_NOTFOUND; + } + + return suspected_type; +} + +/* + * determine what kind of image data we are dealing with + */ +extern "C" +int IL_Type(const char *buf, int32 len) +{ + return il_type(IL_UNKNOWN, buf, len); +} + +/* Set limit on approximate size, in bytes, of all pixmap storage used + by the imagelib. */ +extern "C" +void IL_SetCacheSize(uint32 new_size) +{ +} diff --git a/mozilla/webshell/tests/viewer/nsSetupRegistry.cpp b/mozilla/webshell/tests/viewer/nsSetupRegistry.cpp index 18b4fdd21f9..a5ba0bdfaf9 100644 --- a/mozilla/webshell/tests/viewer/nsSetupRegistry.cpp +++ b/mozilla/webshell/tests/viewer/nsSetupRegistry.cpp @@ -16,14 +16,8 @@ * Corporation. Portions created by Netscape are Copyright (C) 1998 * Netscape Communications Corporation. All Rights Reserved. */ -#ifdef XP_MAC -#include "nsIPref.h" -#define NS_IMPL_IDS -#else #define NS_IMPL_IDS #include "nsIPref.h" -#endif - #include "nsRepository.h" #include "nsWidgetsCID.h" #include "nsGfxCIID.h" diff --git a/mozilla/widget/macbuild/WidgetSharedDebugPrefix.h b/mozilla/widget/macbuild/WidgetSharedDebugPrefix.h index e88b07244fa..465e3fb085e 100644 --- a/mozilla/widget/macbuild/WidgetSharedDebugPrefix.h +++ b/mozilla/widget/macbuild/WidgetSharedDebugPrefix.h @@ -17,5 +17,6 @@ */ #define MAC_SHARED 1 +#define _IMPL_NS_WIDGET 1 -#include "WidgetDebug.prefix" \ No newline at end of file +#include "WidgetDebug.prefix" diff --git a/mozilla/widget/macbuild/WidgetSharedPrefix.h b/mozilla/widget/macbuild/WidgetSharedPrefix.h index 6e439546916..8d654d09c04 100644 --- a/mozilla/widget/macbuild/WidgetSharedPrefix.h +++ b/mozilla/widget/macbuild/WidgetSharedPrefix.h @@ -17,5 +17,6 @@ */ #define MAC_SHARED 1 +#define _IMPL_NS_WIDGET 1 -#include "Widget.prefix" \ No newline at end of file +#include "Widget.prefix" diff --git a/mozilla/widget/macbuild/widget.mcp b/mozilla/widget/macbuild/widget.mcp index c99472a55a6bb08eeefbd5ee9aac266097c1dc83..2df4b5ef235910c0a3421723f53016d6970efa6b 100644 GIT binary patch literal 71120 zcmeHw33MFSb!Bw}Aa;hR9rgLSxTKEMs6HIYWMZjIAe>2^(xbUT(Olt6 zv7r+H{gnWcKnhp}tOQm8tAR9dE6@Y10PX>912RAspyTquY2Xa72ABlS0&9VFz%C#N zv;yma4ZucVIj{+M5_k%D8h8eH7GPW#0Z0dJG4LGlA)pIb2s{rg0bT%J1U?3Q9QXwA zN#I)GQ^2Qz>wxQlZr}#sM&KskW*`7u4cr1SL8^foU>-nX-qiwiKt0d^Gy+XPGtdIe z2bi-9fOEjTzYyHsB%PVc-$qQQ)J%W58X&TZ zhk@Y}(0dvt^*zb>Vc<#CxPkEN-W&QAOVcSOTfzr{WoRk#e9#5BDa@YD7U#8ocTcF;>;&* zH}jc!#`x9%j4PL-kJx7VliSe(6!MEX$XsQfGVc}v%tdZ9^Nu;W9N@MycbUt~*8p$} zuoNitl@*Y=O{;*_z-_=9U@fo?2m-CZdSC;MxYsJ z0pfMvjPU<0P(#!$qR&Ik5EcPVweh{a#VW}#0kfQWs|(~m8AYR5!>B-);djKrct<9YV0 zHnkr1E367*w9iLgARM2FcopWY+-l3R!m^A#^NGaxF|SBF0p=EI7~twj6999K^bjC3 zRqpqgd!#P{%t6wB1elAY{{}P)Nz?uTT;;Xc4(2(?M<+06K|baha~I@et_TM~-UFGr z4D#uiFsDI2wuiY5@_hyq<~YdrdzdiSLB8){!kh>B{uUE%KgiE*Wgh_fne*%mApaeh zus?wO2Qgv40Qr-cuz!I3Ph-M<3G)9sChV6WKiA8;K>qJy5}*Y6ZA@+vqI5U=6{w1~ z+-6V}`^+*SYE`?zmn-=MIQt%`iu(uVAgJmEOxPDeRlkV|`y{C9>zJ@_f~x)$lQlxr zs(uE}z6z>l4B2Nv)!e3_5Vh(p;OxVoYPMm$5Vh)$fU|v|>NFI>v55$;<_eBcwXEYeO2F(tnSKCa~Nfyb209OL$b8aYl(2vKWfp2n5D3p}A@ zwk4_L^WZ5ZGwxhBsF8lVM~GVEAAo0+{B3aN3aIgIOmafh8vh@7Udm0^gP&INdhjz! zW=>5inLcCR1~pMfpMsiR#N=KfYE54RzfZ|;fZwm=zXN|j%FXk@A5?Mx{JfHH2Y*P( z%)5t`OdmX=QIVFDs{COq61x`Cq%R89R7ohpv#*Yb6n;!uGxRTqz88gs)<~4H# zG@o(%ln}M~T<52i%$U9;<@aUkQ){UO_bYi3c$Jdb*Vy++tAH9I$?=lgOzH%y^wt+Mr~{w^7N=ohBtSZp}*m40wx@zXLvB%0BW1N)Cd5NXcRFtCY;VWgiCl znC}aPsQH*v+%}Mpal1x{n(x=Z7c2Qy@FhxSpSo7buY+Hw0gllFebDE`9FurtwPlNKLKAR<*Jq7%au$Yu23@D z$udwC$1%nURJ{|E)k4&&>D$|s{9W)hQm*0ltyS_7@O4W5H{kRysOE>5v3$CGUK^d z$=tquN@g8lB{R?WD>)86pyYeO2bKIJ_>htr(*sI=4V-=f)qew%VIgYu-v{S71*-pR zOb!cCt7rR}AD{+5CLa-^*3bfew~}uJKdNNr!Z9T?CTuIHf!lY25@aqH5u(;G0Y0MS z2f?FCX8T8#{7G|EQ9G1^lB*{sQ=8O8z=Hw++ z2~lhM1^ClaZe}h$qvQqP&nlVze@@A(!Jk+1UEnV$nSJ3!DPNJ(vj3IO#74*ToYo!7 zWOIQ*eJr6TbJ{>YIW#yJ&BW3d+p-(X-c zpXORaXh0^CiRsyp)OVy3iBvMwo6PB%laZ*7a!nOYT?8AHizW1s;%sQBf3PnwIF7}X zGAL>|9n;U~nd75uM`-V0cwpmtbDK(v)uLvLy@P|fQB*aU%a3HyB0bR#S4AVaR7R-8 zT9VoJbb4@HkH>@KS}2(vjwMG^XM)jmnsY{(njgY-mx)+T6f2*ltPaC0D`6Zn+?P5tQ~vEw<+Iar@4gXU zF`d@tVC;^hr&og>MW!?o_y zu`GtQNIWow9_!B9x{n?1D(>cnyDa;w;VzpU&v2Kq2Z3nW6%2P-#&pb@2WQTf zjVzYtb9rqm-CljMOiwjReN{W=cB zqRg>kMIF$i-zxs zj%1_gxJLI=^TnQ@!f|;x9!cg*s|g!QS=|U6Zz|@jESOA3QwdXvn3qLkCnrq>n3HOw z`)B2me4(?OYzr#6fH*ki5bcrYfh)!XKAZ?fWA}=)$~e)i`KruqN3kRbb&&QK?TjKC z7&8zWFhA(Rj^~tyT-Y_k?w||17T68Du$vFNLoV!ip6IX(yJfIDRkU;T-*VVZ6zvR` zL2dEh3e3k{*sX+J!iC*!u-ja;b8O!l*lluQw-$EEqMhS*tb<+3gj8T-a@a-J}b_lyg>Uf4b7 z!j9*kpLb!`2fK4F?D}E%qGty$SjSz@FTy2PmS2iZ_M}Vl0EWc}FL22z(;D1HNfHMq z^8Z|@^sJ9kTTcEcUFkU>rM8|5QcBAiA*Cxh5oFOC{|c41cffSUN9p7lt9~74qSRkZ zRbW1cWKvm9C7JZ<xxJEtxsPue)e zqEKoRkV27tR0^ebp(&Kv#HUbX8zgICNe3$w+Jvi6M^F0qN8x!4jyb3rkV z7Of?irjpW#7K&`bS}1ait?ZM+%ybz+Wj60E5V<<#x`2`T4ok{(bXcs=DEnm#rF3=K z3PkJdcd4=tVc?jSqO@FQ3Ipfl6vdADDN4(2pfD(t!=`fEG#2IM(^Z%_Wvo%?n6!pP z>`@D=)obAq}vvq%#W_EiFo$C@OP@=&4dm)RfM;VNhD4 zg!$6wK;;ybLQzRH3ToRZ6bdcgFDR!p&feQFxA$_fz;-0DbFs`zSz_a7bFqW7%_bI) zn+vR4Rw%LfzMw1(Ktb;m1xtBJC@f{R@vvA}f?_GLZ@+zb3JcoDsHC(cP;xJA(-VyG z&L&93g&aauG_VAysJ3pN)LVihRi&YkTBpF6N=w3GDzOcUsoWA0lisey_Ti8V*$2Z? zW`yFBP7oLi@dPTb?U2{K_QdYMg$uu_?g=(*j0ZQ08c&*|9^i$c>j7S0WX|xu@oJz3 zmb?bvj;y`w(yya5bRv-jy1GWP@fHt5V*a>t3-M}tjH?Rlj2WGM^v3-abV~r>bi~B$Z z$0HeiRO}DJ8U18z5;r+3!r8?Sf|oIqV$id=fpm$mg`dG-Ku=*+YFf7d>RKX2klYI^$E^C z;gRQo>3G1@M@-!cBkhzk`BGy!pRd{VIxj1y6Ay1$dH{QMdFX38qvCnS^S~VPKrb0JVq1ef)2% zRd@FF9EwiFMtRO~co2_e*UCQvzT?MZNjx(biQ^F{w^dv0j%Ra`%q6xF6&*j0r?L~V zWF&WKtLKR!o-!(-hT-1Mp01(eoqfF5aZVD3)CCoeFZ%Z#Il{B*@4J6|%ucmdKVBcg zanBq3w1q1>_H}lx46N*IA8H2+_jU~N9ORs#!s)?<=F@|PGlLaR51J1kjI)C3WZIl@ zp|_#$fd}Np2j*988}~REtGvH0?}4AMpemUR7eHWqZH_M#3W-NWL)lE!%Z)22kTcX& zQ$AFwd>F;uy`gA4h6k+GYl3EIU0yX;h6mL6P;HYBS-$ki8z-)eIL=fnRX&K5UD#iU z@nNRw_UgH^JYd>i%#-5-4;&H^@8IFeisMYRwvZ2P#_=TcVKOaG;dr}>ney|MQjaMg z3i}JZaYp>R@CJ!1C5SWFPE$Up{Y5Aq8xcEnfX zGwsV&)i7yVHxxrvvkX9mU%QO~KgUT)xUyC$a6&sW+mF>Z)& z8S(W84#W7(vuy;w$p0vOA&f0uLnz}Iykb3NJ96>AMdf^`y)0Dl2W5QO^t< zNyz_#Wp{Ac`pPuhj!4{`6*T?#a)><6E?(S!ILCVE!I}6EC+bO+kB6K6j;IHpM4Zmf z=Y(oTaGHO-RXu)G_aLrR@M47|-W!J(oxJwY-yFPf;jj797LVqp2byZ8=EZsB#g{Hz z_!(c?f8iM>$-dU zx=>xC;>#6pP<*T61-mV3e!FR93z|ChlaYKp$Af+zxcHUP4#nF{#w`tp!U5Shn$A-u z>lNRi_(sKVSA3J=n@v?UH*#x=b=8{6<~QLpvUqEx_!^gaMIlvDv*Pm=Z&7@u;tLdC zp?Is}LB-c8zE<&Vrj`2^44%#6LuB}~sy;7>Ev-?8%M|ZZyjSsl#r>v={7riYEtQxH ztLnv9`XcA_QB+^c#W7fPE52Ltor;7(PBp*Fw7TjV@zSY6ZAgm_T7mZ{zDDue z6c=kjxu_kyORGA&F@Orn($!oVZCI%IBE_#!e6iw76u(yS>lD9U@f#GsQSqA;zgh8s z;A4qPzUzxa=(`my4ets%i9K1KKQ&BlwaOhcx%7>9*}RJ5Z{Qp z{EfLBE%4s-cR9R1`_}0_QSBI$6DaYXsE%f0Y3J8q&(u>P)4UB&#E|iFbMK@ut}yYQ zs4nLq?}_Si-Z9t06bLrgl@nB6m;CsPW@4wetoA11Je%f=@r8SrxR$AuGyYs;DX?{E0 z-CD|8c}I?A-QyK{9xyzxh~Lx(c|)J!5>N0v;CWz5i(P`TU#Q=`GnG${ z;+|j|Q>eu8JFk1-g+P3m|H6gg-o2g4e0)0Zg129lr}aE=<#~VyT0RZ`Ip_24vkty2 zU(W_lMW$T3I?@{s^ba2ii%s;gKY28_J$6+|`@R>6xUS z3v^AUJM-KU~ktY*5fVq0r9|iE|(6qw(@gB z!E8PmjHVK;=}c-gAI)W3PmNBrZU}B@#eJsP)<`@{2Gbe+ zWNgxGQBn5Ip1&UCsC#fqJ}45k+SfB=1s0!4oscy-N`@=uEFF&jatR z2fRxW@2!8m+C2|=9=LKm;9ZI^VkQ1Q82=%>OA&@+Ji+t8#e2ZJ6mjuB^Og`E@GeDo zi7*o$@GeEbi{7P(nMkD%P#xZ-h#9yPflt5j%EVq5pOWLf75j^J#yfA_esTMxU83%d=l%et`J2)mpMyG^jm zyRh2~yVEZ0Zin3&7j|1a?f!2Jo1{ql0< z%Ln4qwZ&9>zoiYo#P`LuL^fA)Z*ARIaQDf1=u7TN_pQPqBlSsZOBeswVm(#w6w4N1 z|5>QVtgm{dSdUr167@7_iCmiNHToUC9)5ze(DMu5CVkx#m=7d!*;0G7Q(FN0nAN`a z1m-`R$i-7ueO(*oS7EzgZ*EUJ{NrDXkDZt3pIW48)teK!F|5~YKktrWJ&+8lyANU$ zZx+&g34V_KT3OVCPec1VrGCrx&@Gkv=X#<4qi|m~r}@71yU^V#^>y%@s%L-0mmsf^ z`raQI^@N}K7wF)3QtwNc$o1~{0sG2b)N0z1rw#iZKYkL5E}_=ya^Q7|Na?c(-Cu_O zvx$g^i!>F}4TzU^ooN5+JvTt^lZAJ`iI0B2D)g)V%NL>JC#ykyI9{G7+p~JdI23FX z=$;2PZONyk{U3Z43XUhB0URItYNh_gm!XjNdTWC?KJwQ|{c~)?egM?H1e5Jj|EKi% z0JWO7;qNhN5&G4uk3k-!7KbK0jv0~muVeS94N;4F4q~!U>i_)@ARnL>`cs%RNd4FD zhfF(AcMcP|U8|m44SASaEcR=dydmxXkZnIiEfzx#_?Afh=l4KySg5t(N5Ef^`nNs@ z`H0kap9dE=n`x_#FNgdQsXw#^eo+3r>nqURE%l2j7y1RaOOj7R{uuqMsMk8tUyS}` z(%1eH3l{p3N#6x~qaT^{z5f<^nGd0V$7AfP0MIAUUsOJXUJ62SwNPuXeACE>&}*NC zZlTnF`TIsbg#P?9&|!Jfx5kWo2(9=96xRr~_IlFDhtPNa4my6q9dv}p(J~)G)?`7ZOhhg#InT$1?^`oR{+H&Ux<|M}OAd!Uw@8@f@c|1;S57RY+O^$v8p)c-lQu_`R< zdGdAWPD=d`JHciBM}MadGV+G>L&Ud6+28tqpcofw?I-^U^;{+E{{q^eVZ0~3&3N4* z>%ae3AhZ92-dTW2v(!I+1~U3H=^e&X=E>3D`!eLGsD*w5Cd$vbX2?%d3;i}sq@R!Z zImSOjE%eM6>E~np{|Nb6YN5wCr2KrWo^5CTf&LcbLBY>oV!WOgYVD`D7yaBpA0R(S ze-Byt`Pj9~p?FcKwSU5XvEb)#tb*=iQvWW-XXWRkf5mlvT!?g2VN3-j8$moZ(u?s zwgqyLk#%@&O>R6C*tjhaOOEQv+&U<;>k_F^y+OUvCJ{}GFE#|Txv{a}_+)TA9n0aH z5`L|}Kb+|p?(Jf|qH=N*y>`YwscHX;sQVY`fxUVz8;zv(KsY}Vk3|E0v8bNR>dk@M z0tfX>HkL{THU!rPR^`U^z|y_pzNM?T1xBQ8;@lJCu4Cvpif5i zbPkQ?^0=is9gjtlQ9W=bmK%o|Ru}FI1_Fmw1*wr78g^i9)pvin<9}>i&*!9Mi(i|3 z{1$*&WTC4@^hjoOIi6?{jpkk3TJ?tD#;uykFUAtP{_j_{D$EH_m<{A22;aI1)rsXY zixa7Hv3NYvDxKV#h(t&7vG}O0q8OywpZ|Q-tsHu8z~JnQPQ+lLU6qKQ&Vt{hoyQbZ u`}3bRL7op$>=IkTnbavgnoDH@osnE*G2+*8aL{n`fSyg|Gf}-#{Qf^LV^&@O delta 7857 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 bU6U8*8UcUOsoMkWI`Q4OY4S_C#_E3o04w`U diff --git a/mozilla/widget/src/mac/nsMacMessagePump.cpp b/mozilla/widget/src/mac/nsMacMessagePump.cpp index 32acbdeb844..9a13556a73e 100644 --- a/mozilla/widget/src/mac/nsMacMessagePump.cpp +++ b/mozilla/widget/src/mac/nsMacMessagePump.cpp @@ -51,7 +51,7 @@ const char MOUSEMOVEDMESSAGE = 0xFA; //nsWindow* nsMacMessagePump::gGrabWindow = nsnull; // need this for grabmouse //static NS_DEFINE_IID(kITEXTWIDGETIID, NS_TEXTFIELD_CID); -nsMacMessagePump::nsWindowlessMenuEventHandler nsMacMessagePump::gWindowlessMenuEventHandler = nsnull; +NS_WIDGET nsMacMessagePump::nsWindowlessMenuEventHandler nsMacMessagePump::gWindowlessMenuEventHandler = nsnull; bool IsUserWindow ( WindowPtr ) ; diff --git a/mozilla/widget/src/mac/nsWidgetFactory.cpp b/mozilla/widget/src/mac/nsWidgetFactory.cpp index 4cad9ea6b63..84e1c397cfc 100644 --- a/mozilla/widget/src/mac/nsWidgetFactory.cpp +++ b/mozilla/widget/src/mac/nsWidgetFactory.cpp @@ -106,7 +106,8 @@ private: nsWidgetFactory::nsWidgetFactory(const nsCID &aClass) -{ +{ + NS_INIT_REFCNT(); mClassID = aClass; } @@ -261,12 +262,10 @@ nsresult nsWidgetFactory::LockFactory(PRBool aLock) } // return the proper factory to the caller -#ifdef MAC_STATIC +#if defined(XP_MAC) && defined(MAC_STATIC) extern "C" NS_WIDGET nsresult NSGetFactory_WIDGET_DLL(const nsCID &aClass, nsIFactory **aFactory) -#elif defined(MAC_SHARED) -#pragma export on +#else extern "C" NS_WIDGET nsresult NSGetFactory(const nsCID &aClass, nsIFactory **aFactory) -#pragma export off #endif { if (nsnull == aFactory) { @@ -281,5 +280,3 @@ extern "C" NS_WIDGET nsresult NSGetFactory(const nsCID &aClass, nsIFactory **aFa return (*aFactory)->QueryInterface(kIFactoryIID, (void**)aFactory); } - - diff --git a/mozilla/xpcom/components/nsMacRepository.h b/mozilla/xpcom/components/nsMacRepository.h index 7ead8aa1b1f..689230d582b 100644 --- a/mozilla/xpcom/components/nsMacRepository.h +++ b/mozilla/xpcom/components/nsMacRepository.h @@ -68,6 +68,7 @@ extern "C" PRBool NSCanUnload_PREF_DLL(void); // library list static MacLibrary libraries[] = { +#if 0 WIDGET_DLL, NSGetFactory_WIDGET_DLL, NULL, GFXWIN_DLL, NSGetFactory_GFXWIN_DLL, NULL, VIEW_DLL, NSGetFactory_VIEW_DLL, NULL, @@ -79,7 +80,9 @@ static MacLibrary libraries[] = { LAYOUT_DLL, NSGetFactory_LAYOUT_DLL, NULL, NETLIB_DLL, NSGetFactory_NETLIB_DLL, NULL, //EDITOR_DLL, NSGetFactory_EDITOR_DLL, NULL, // FIX ME - NULL}; +#endif + NULL +}; static void* FindMacSymbol(char* libName, const char *symbolName) { diff --git a/mozilla/xpcom/components/nsRepository.cpp b/mozilla/xpcom/components/nsRepository.cpp index d7370d4a763..206489f966a 100644 --- a/mozilla/xpcom/components/nsRepository.cpp +++ b/mozilla/xpcom/components/nsRepository.cpp @@ -37,12 +37,14 @@ #include "NSReg.h" #endif +#if 0 #ifdef XP_MAC #ifdef MOZ_NGLAYOUT #define IMPL_MAC_REPOSITORY #include "nsMacRepository.h" #endif #endif +#endif nsHashtable *nsRepository::factories = NULL; PRMonitor *nsRepository::monitor = NULL; diff --git a/mozilla/xpcom/macbuild/xpcom.exp b/mozilla/xpcom/macbuild/xpcom.exp index f45c0f14112..dac25b442e1 100644 --- a/mozilla/xpcom/macbuild/xpcom.exp +++ b/mozilla/xpcom/macbuild/xpcom.exp @@ -83,3 +83,9 @@ PL_NewVector # nsServiceManager static method exports. ReleaseService__16nsServiceManagerFRC4nsIDP11nsISupportsP19nsIShutdownListener GetService__16nsServiceManagerFRC4nsIDRC4nsIDPP11nsISupportsP19nsIShutdownListener + +# nsTraceRefcnt +Destroy__13nsTraceRefcntFPvPCci +Create__13nsTraceRefcntFPvPCcPCci +Release__13nsTraceRefcntFPvUlPCci +AddRef__13nsTraceRefcntFPvUlPCci diff --git a/mozilla/xpcom/macbuild/xpcomPPC.mcp b/mozilla/xpcom/macbuild/xpcomPPC.mcp index 744d9e32dcda10b884967cdadf32729c19794a99..75864c19ce8a1ee285e502f3234cbb0ffa862855 100644 GIT binary patch delta 2654 zcmb7_c}!GC9LHzg?!LDy2&;Gi>j4E?FHpoPumxEK0mZ4(RDT6&liU)qh0SV`5yrqN=pS0WL6NEK~p>(SWOet&P?R{LisJDK0_eSS0Z zo!|W4+xPm6rk$>#D>iOi&lqzs#z!*#bUx#g)-dMz1kX0L4fQ#=Ut~EZ^ITEm80p4C zj=o5AW%F0~ zu6R@5V{lQS$BH;tKe0ux7Y<{X*p{Cjhs{#ZQ_;twr=cgK=ZHNZZA@aq!jy=`&RjFESm&bLlPHF}3=#CSih`2kBtT=jY_H@)L}%1INVi4$ z%(8yl9OBM^EYlzRZmPLIdm1-m{Bhjn$Le!KK|gQNLh+aQWiGbor<+l$3p6wDP?To! z!nIr+DVh|3*0Dt;GYT=L+GDakPPWGsdz@sCS@xJ_jUsb;N)%>i+E4vr#q<{<@E}{^ z?&%|Z@FtR{Au$jZZjKFOb~FZ(La`UQ&gH?${J1<*$z7sihQZxpO7RI%UG`RJ!dH-Q zuAVi_WA-eI)2%~@Q(mvpP&gIh%gn3ZL7G_F*eaSzqeOF&yRpI}*DT}{Li%i8>@?eJ zS`yVFV(R)#aX9a!?D&Z?X{5R#=o$3fP%x9n^U#rZxR;AVhu4_%x)KwtO#Q3K+Bca} zkE7v0_}R^A**S-{XUt%1kUtb`=MT8pw{WnrJ>yGk&`VGL;9_07hkMQ7{aDRx_+qBV ziRm%st(~>eX6eN!J+!=-FL#I1Kj0os#E6K{_%1%e5!!o%8`%7lruJvRd24_6wZellgnk&bv`&D@)f+pJHR*mmzU0!mEc<18M*d4 zPfwV5oiP`yuB)M!{!wz7fF zIBSoFO+H$|-;)0fUbGaFFRS^he*_p}VHTMzGl&;wfe%o87D|G}+kBj?BEIB1oPDO^ z*(bn!im!M=HWDv94u84gFJ6W{O!1;8We4$+QuzH8-_Kuu(769L=(l`06gk60R!Vb^w5?0B!bM86@8D9C)JQqrL~2 zVqxaIDcf%FA@QHX9jI_M$qy*(I4!#gFMzAE%hPtjo~E$7LiWE2jKx`=nq9XFcA>(~ z{W5S9n`fhN!pXn)5Nx{5&&pbwJ^-$ryOLViB?=oUvW2EQakg;o#?#r$6nFh9J860y zT$MULwFdS~g*~Z~_hNb`rf|D-o_YohuLHG+tulkS{u!KfrT)zV*p)s8|--dkpf3)Szc>sHv!hs?g zxQ*#CRH9i*UdaU5%N37UDQk&)eui(?SbZGqm5LiDWef3wboj^B{7>J9O;v@q`@HNV zzW559R>cd)z+OWX|5qK7{{p_R9`~g5X~`)7>nzL`RLczF5mZ`=J1S1X-mLiky)w`T z9z#WK^M-q{>59Tzq&h(> z_*L>d6mSk%4F_zc8)znsTB(v5R)C`kp1ZngJ$=O=YY$e+jyp)he$u4Uu&Dk%>;o$3 zPbT}U1s+a-MkQgw06V{4R$2j3c+@E?Y4SEm2~ delta 6375 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 diff --git a/mozilla/xpcom/public/nsMacRepository.h b/mozilla/xpcom/public/nsMacRepository.h index 7ead8aa1b1f..689230d582b 100644 --- a/mozilla/xpcom/public/nsMacRepository.h +++ b/mozilla/xpcom/public/nsMacRepository.h @@ -68,6 +68,7 @@ extern "C" PRBool NSCanUnload_PREF_DLL(void); // library list static MacLibrary libraries[] = { +#if 0 WIDGET_DLL, NSGetFactory_WIDGET_DLL, NULL, GFXWIN_DLL, NSGetFactory_GFXWIN_DLL, NULL, VIEW_DLL, NSGetFactory_VIEW_DLL, NULL, @@ -79,7 +80,9 @@ static MacLibrary libraries[] = { LAYOUT_DLL, NSGetFactory_LAYOUT_DLL, NULL, NETLIB_DLL, NSGetFactory_NETLIB_DLL, NULL, //EDITOR_DLL, NSGetFactory_EDITOR_DLL, NULL, // FIX ME - NULL}; +#endif + NULL +}; static void* FindMacSymbol(char* libName, const char *symbolName) { diff --git a/mozilla/xpcom/src/nsRepository.cpp b/mozilla/xpcom/src/nsRepository.cpp index d7370d4a763..206489f966a 100644 --- a/mozilla/xpcom/src/nsRepository.cpp +++ b/mozilla/xpcom/src/nsRepository.cpp @@ -37,12 +37,14 @@ #include "NSReg.h" #endif +#if 0 #ifdef XP_MAC #ifdef MOZ_NGLAYOUT #define IMPL_MAC_REPOSITORY #include "nsMacRepository.h" #endif #endif +#endif nsHashtable *nsRepository::factories = NULL; PRMonitor *nsRepository::monitor = NULL; diff --git a/mozilla/xpfe/macbuild/xpfeviewer.mcp b/mozilla/xpfe/macbuild/xpfeviewer.mcp index b0dfcf51e824a5a846d816b2d9035ee22e9cb4a2..bb284a2d752286adb538bd686a5fa75e7d86f7d6 100644 GIT binary patch delta 6967 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 Git delta 5674 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