diff --git a/mozilla/caps/src/nsSecurityManagerFactory.cpp b/mozilla/caps/src/nsSecurityManagerFactory.cpp index 2ae4d5459ba..4b0c1055620 100644 --- a/mozilla/caps/src/nsSecurityManagerFactory.cpp +++ b/mozilla/caps/src/nsSecurityManagerFactory.cpp @@ -67,13 +67,3 @@ static nsModuleComponentInfo components[] = NS_IMPL_NSGETMODULE("nsSecurityManagerModule", components); -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - - diff --git a/mozilla/chrome/src/nsChromeFactory.cpp b/mozilla/chrome/src/nsChromeFactory.cpp index 43fc2e282a8..4b25c4767af 100644 --- a/mozilla/chrome/src/nsChromeFactory.cpp +++ b/mozilla/chrome/src/nsChromeFactory.cpp @@ -53,13 +53,3 @@ static nsModuleComponentInfo components[] = NS_IMPL_NSGETMODULE("nsChromeModule", components); - -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - diff --git a/mozilla/content/build/nsContentModule.cpp b/mozilla/content/build/nsContentModule.cpp index 8ba6c06dd3e..231878a6469 100644 --- a/mozilla/content/build/nsContentModule.cpp +++ b/mozilla/content/build/nsContentModule.cpp @@ -452,12 +452,3 @@ nsContentModule::CanUnload(nsIComponentManager *aCompMgr, PRBool *okToUnload) return NS_ERROR_FAILURE; } -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - diff --git a/mozilla/db/mork/build/nsMorkFactory.cpp b/mozilla/db/mork/build/nsMorkFactory.cpp index 0f4185c0d1b..3685e8087d5 100644 --- a/mozilla/db/mork/build/nsMorkFactory.cpp +++ b/mozilla/db/mork/build/nsMorkFactory.cpp @@ -92,12 +92,3 @@ NS_IMETHODIMP nsMorkFactoryFactory::GetMdbFactory(nsIMdbFactory **aFactory) return (gMDBFactory) ? NS_OK : NS_ERROR_OUT_OF_MEMORY; } -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - diff --git a/mozilla/docshell/build/nsDocShellModule.cpp b/mozilla/docshell/build/nsDocShellModule.cpp index ffdbdd52cbb..cff082bea23 100644 --- a/mozilla/docshell/build/nsDocShellModule.cpp +++ b/mozilla/docshell/build/nsDocShellModule.cpp @@ -50,13 +50,3 @@ static nsModuleComponentInfo gDocShellModuleInfo[] = { // be dispensing docshells rather than webshells. NS_IMPL_NSGETMODULE("docshell provider", gDocShellModuleInfo) - -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - diff --git a/mozilla/dom/src/build/nsDOMFactory.cpp b/mozilla/dom/src/build/nsDOMFactory.cpp index 7da4bcbc0eb..3b25147e24c 100644 --- a/mozilla/dom/src/build/nsDOMFactory.cpp +++ b/mozilla/dom/src/build/nsDOMFactory.cpp @@ -861,13 +861,3 @@ void DumpJSEval(PRUint32 frame, const char* text) JS_END_EXTERN_C #endif - -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - diff --git a/mozilla/editor/base/nsEditor.cpp b/mozilla/editor/base/nsEditor.cpp index b963e8bf1a3..019d3ef4e8a 100644 --- a/mozilla/editor/base/nsEditor.cpp +++ b/mozilla/editor/base/nsEditor.cpp @@ -5123,13 +5123,3 @@ nsEditor::CreateHTMLContent(const nsAReadableString& aTag, nsIContent** aContent return NS_OK; } - -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - diff --git a/mozilla/editor/libeditor/base/nsEditor.cpp b/mozilla/editor/libeditor/base/nsEditor.cpp index b963e8bf1a3..019d3ef4e8a 100644 --- a/mozilla/editor/libeditor/base/nsEditor.cpp +++ b/mozilla/editor/libeditor/base/nsEditor.cpp @@ -5123,13 +5123,3 @@ nsEditor::CreateHTMLContent(const nsAReadableString& aTag, nsIContent** aContent return NS_OK; } - -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - diff --git a/mozilla/editor/libeditor/txtsvc/nsTextServicesFactory.cpp b/mozilla/editor/libeditor/txtsvc/nsTextServicesFactory.cpp index addd6f5dcc5..0481b7c2f03 100644 --- a/mozilla/editor/libeditor/txtsvc/nsTextServicesFactory.cpp +++ b/mozilla/editor/libeditor/txtsvc/nsTextServicesFactory.cpp @@ -55,13 +55,3 @@ static nsModuleComponentInfo components[] = { // and the entire implementation of the module object. // NS_IMPL_NSGETMODULE("nsTextServicesModule", components) - -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - diff --git a/mozilla/editor/txmgr/src/nsTransactionManager.cpp b/mozilla/editor/txmgr/src/nsTransactionManager.cpp index 380e09541b8..f895f621e86 100644 --- a/mozilla/editor/txmgr/src/nsTransactionManager.cpp +++ b/mozilla/editor/txmgr/src/nsTransactionManager.cpp @@ -1231,13 +1231,3 @@ nsTransactionManager::Unlock() return NS_OK; } - -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - diff --git a/mozilla/editor/txtsvc/src/nsTextServicesFactory.cpp b/mozilla/editor/txtsvc/src/nsTextServicesFactory.cpp index addd6f5dcc5..0481b7c2f03 100644 --- a/mozilla/editor/txtsvc/src/nsTextServicesFactory.cpp +++ b/mozilla/editor/txtsvc/src/nsTextServicesFactory.cpp @@ -55,13 +55,3 @@ static nsModuleComponentInfo components[] = { // and the entire implementation of the module object. // NS_IMPL_NSGETMODULE("nsTextServicesModule", components) - -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - diff --git a/mozilla/embedding/browser/build/nsWebBrowserModule.cpp b/mozilla/embedding/browser/build/nsWebBrowserModule.cpp index 27a10c4cc0a..5debb6eb3a7 100644 --- a/mozilla/embedding/browser/build/nsWebBrowserModule.cpp +++ b/mozilla/embedding/browser/build/nsWebBrowserModule.cpp @@ -53,12 +53,3 @@ NS_IMPL_NSGETMODULE("Browser Embedding Module", components) -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - diff --git a/mozilla/embedding/components/build/nsModule.cpp b/mozilla/embedding/components/build/nsModule.cpp index 2471141db58..e5469e876c5 100644 --- a/mozilla/embedding/components/build/nsModule.cpp +++ b/mozilla/embedding/components/build/nsModule.cpp @@ -40,13 +40,3 @@ static nsModuleComponentInfo components[] = { }; NS_IMPL_NSGETMODULE("embedcomponents", components) - -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - diff --git a/mozilla/extensions/cookie/nsCookieService.cpp b/mozilla/extensions/cookie/nsCookieService.cpp index e468110de49..1fba8896f42 100644 --- a/mozilla/extensions/cookie/nsCookieService.cpp +++ b/mozilla/extensions/cookie/nsCookieService.cpp @@ -194,13 +194,3 @@ NS_IMETHODIMP nsCookieService::Observe(nsISupports *aSubject, const PRUnichar *a return rv; } - -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - diff --git a/mozilla/extensions/wallet/build/nsWalletViewerFactory.cpp b/mozilla/extensions/wallet/build/nsWalletViewerFactory.cpp index 0fdb18e2dec..f7e6e5438a6 100644 --- a/mozilla/extensions/wallet/build/nsWalletViewerFactory.cpp +++ b/mozilla/extensions/wallet/build/nsWalletViewerFactory.cpp @@ -44,12 +44,3 @@ static nsModuleComponentInfo components[] = { NS_IMPL_NSGETMODULE("nsWalletViewerModule", components) -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - diff --git a/mozilla/extensions/wallet/src/nsWalletFactory.cpp b/mozilla/extensions/wallet/src/nsWalletFactory.cpp index 023c0404797..f5e4ec04550 100644 --- a/mozilla/extensions/wallet/src/nsWalletFactory.cpp +++ b/mozilla/extensions/wallet/src/nsWalletFactory.cpp @@ -43,13 +43,3 @@ static nsModuleComponentInfo components[] = { }; NS_IMPL_NSGETMODULE("nsWalletModule", components) - -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - diff --git a/mozilla/extensions/xmlextras/build/src/nsXMLExtrasModule.cpp b/mozilla/extensions/xmlextras/build/src/nsXMLExtrasModule.cpp index 4df5258fbc1..b45b50a6d7b 100644 --- a/mozilla/extensions/xmlextras/build/src/nsXMLExtrasModule.cpp +++ b/mozilla/extensions/xmlextras/build/src/nsXMLExtrasModule.cpp @@ -232,13 +232,3 @@ static nsModuleComponentInfo components[] = { }; NS_IMPL_NSGETMODULE("nsXMLExtrasModule", components) - -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - diff --git a/mozilla/gfx/src/nsBlender.cpp b/mozilla/gfx/src/nsBlender.cpp index dfe060eecf4..db3725da5d2 100644 --- a/mozilla/gfx/src/nsBlender.cpp +++ b/mozilla/gfx/src/nsBlender.cpp @@ -968,13 +968,3 @@ register PRUint32 *bp; //------------------------------------------------------------ - -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - diff --git a/mozilla/htmlparser/src/nsParserModule.cpp b/mozilla/htmlparser/src/nsParserModule.cpp index c3352f8265c..21bf64646ee 100644 --- a/mozilla/htmlparser/src/nsParserModule.cpp +++ b/mozilla/htmlparser/src/nsParserModule.cpp @@ -356,14 +356,3 @@ extern "C" NS_EXPORT nsresult NSGetModule(nsIComponentManager *servMgr, gModule = m; // WARNING: Weak Reference return rv; } - - -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - diff --git a/mozilla/intl/chardet/src/nsCharDetModule.cpp b/mozilla/intl/chardet/src/nsCharDetModule.cpp index c98a8beec1d..8e99796053d 100644 --- a/mozilla/intl/chardet/src/nsCharDetModule.cpp +++ b/mozilla/intl/chardet/src/nsCharDetModule.cpp @@ -462,13 +462,3 @@ extern "C" NS_EXPORT nsresult NSGetModule(nsIComponentManager *servMgr, gModule = m; // WARNING: Weak Reference return rv; } - -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - diff --git a/mozilla/intl/locale/src/nsLocaleFactory.cpp b/mozilla/intl/locale/src/nsLocaleFactory.cpp index 7cf6e297022..c49d55b8d28 100644 --- a/mozilla/intl/locale/src/nsLocaleFactory.cpp +++ b/mozilla/intl/locale/src/nsLocaleFactory.cpp @@ -562,13 +562,3 @@ void notCalled() (void)NSGetFactory(nsnull, cid, nsnull, nsnull, nsnull); } #endif - -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - diff --git a/mozilla/intl/lwbrk/src/nsLWBrkModule.cpp b/mozilla/intl/lwbrk/src/nsLWBrkModule.cpp index 8186a3952ae..fd2d9a7aedb 100644 --- a/mozilla/intl/lwbrk/src/nsLWBrkModule.cpp +++ b/mozilla/intl/lwbrk/src/nsLWBrkModule.cpp @@ -38,13 +38,3 @@ static nsModuleComponentInfo components[] = { }; NS_IMPL_NSGETMODULE("nsLWBrkModule", components); - -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - diff --git a/mozilla/intl/strres/src/nsStringBundle.cpp b/mozilla/intl/strres/src/nsStringBundle.cpp index d468dd2219c..17d432fbfae 100644 --- a/mozilla/intl/strres/src/nsStringBundle.cpp +++ b/mozilla/intl/strres/src/nsStringBundle.cpp @@ -1211,13 +1211,3 @@ static nsModuleComponentInfo components[] = NS_IMPL_NSGETMODULE("nsStringBundleModule", components) - -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - diff --git a/mozilla/intl/uconv/src/nsUConvModule.cpp b/mozilla/intl/uconv/src/nsUConvModule.cpp index 4371dbf903b..d72cc1870a3 100644 --- a/mozilla/intl/uconv/src/nsUConvModule.cpp +++ b/mozilla/intl/uconv/src/nsUConvModule.cpp @@ -370,13 +370,3 @@ extern "C" NS_EXPORT nsresult NSGetModule(nsIComponentManager *servMgr, gModule = m; // WARNING: Weak Reference return rv; } - -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - diff --git a/mozilla/intl/uconv/ucvcn/nsUCvCnModule.cpp b/mozilla/intl/uconv/ucvcn/nsUCvCnModule.cpp index be37f29c8bf..d7c12f5e509 100644 --- a/mozilla/intl/uconv/ucvcn/nsUCvCnModule.cpp +++ b/mozilla/intl/uconv/ucvcn/nsUCvCnModule.cpp @@ -149,13 +149,3 @@ static nsModuleComponentInfo components[] = }; NS_IMPL_NSGETMODULE("nsUCvCnModule", components); - -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - diff --git a/mozilla/intl/uconv/ucvja/nsUCvJaModule.cpp b/mozilla/intl/uconv/ucvja/nsUCvJaModule.cpp index 4739f9651ae..1479604bf3c 100644 --- a/mozilla/intl/uconv/ucvja/nsUCvJaModule.cpp +++ b/mozilla/intl/uconv/ucvja/nsUCvJaModule.cpp @@ -154,13 +154,3 @@ static nsModuleComponentInfo components[] = NS_IMPL_NSGETMODULE("nsUCvJAModule", components); - -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - diff --git a/mozilla/intl/uconv/ucvlatin/nsUCvLatinModule.cpp b/mozilla/intl/uconv/ucvlatin/nsUCvLatinModule.cpp index c5b3cd65fcf..4d078b58e95 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUCvLatinModule.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsUCvLatinModule.cpp @@ -996,13 +996,3 @@ static nsModuleComponentInfo components[] = NS_IMPL_NSGETMODULE("nsUCvLatinModule", components); - -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - diff --git a/mozilla/intl/uconv/ucvtw/nsUCvTwModule.cpp b/mozilla/intl/uconv/ucvtw/nsUCvTwModule.cpp index fe1bd0f1116..7f2a14f5e84 100644 --- a/mozilla/intl/uconv/ucvtw/nsUCvTwModule.cpp +++ b/mozilla/intl/uconv/ucvtw/nsUCvTwModule.cpp @@ -121,13 +121,3 @@ static nsModuleComponentInfo components[] = NS_IMPL_NSGETMODULE("nsUCvTWModule", components); - -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - diff --git a/mozilla/intl/uconv/ucvtw2/nsUCvTw2Module.cpp b/mozilla/intl/uconv/ucvtw2/nsUCvTw2Module.cpp index 8cf51e1164c..dab5c0d1a24 100644 --- a/mozilla/intl/uconv/ucvtw2/nsUCvTw2Module.cpp +++ b/mozilla/intl/uconv/ucvtw2/nsUCvTw2Module.cpp @@ -199,13 +199,3 @@ static nsModuleComponentInfo components[] = }; NS_IMPL_NSGETMODULE("nsUCvTW2Module", components); - -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - diff --git a/mozilla/intl/unicharutil/src/nsUcharUtilModule.cpp b/mozilla/intl/unicharutil/src/nsUcharUtilModule.cpp index f4952121084..41eeac03e14 100644 --- a/mozilla/intl/unicharutil/src/nsUcharUtilModule.cpp +++ b/mozilla/intl/unicharutil/src/nsUcharUtilModule.cpp @@ -103,13 +103,3 @@ static nsModuleComponentInfo components[] = NS_IMPL_NSGETMODULE("UcharUtil", components) - -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - diff --git a/mozilla/js/src/xpconnect/loader/mozJSComponentLoader.cpp b/mozilla/js/src/xpconnect/loader/mozJSComponentLoader.cpp index 98943eb6ce6..781b6ad9258 100644 --- a/mozilla/js/src/xpconnect/loader/mozJSComponentLoader.cpp +++ b/mozilla/js/src/xpconnect/loader/mozJSComponentLoader.cpp @@ -1325,13 +1325,3 @@ static nsModuleComponentInfo components[] = { }; NS_IMPL_NSGETMODULE("JS component loader", components); - -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - diff --git a/mozilla/js/src/xpconnect/shell/xpcshell.cpp b/mozilla/js/src/xpconnect/shell/xpcshell.cpp index 7509e0ece81..36412e3116c 100644 --- a/mozilla/js/src/xpconnect/shell/xpcshell.cpp +++ b/mozilla/js/src/xpconnect/shell/xpcshell.cpp @@ -909,13 +909,3 @@ void Datom(JSAtom *atom) { if (atom) DumpAtom(&atom->entry, 0, gErrFile); } //void Dxpc(int depth) {Dobj(GetXPConnect(), depth);} JS_END_EXTERN_C #endif - -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - diff --git a/mozilla/js/src/xpconnect/src/xpcmodule.cpp b/mozilla/js/src/xpconnect/src/xpcmodule.cpp index 428f9064c10..55366395a07 100644 --- a/mozilla/js/src/xpconnect/src/xpcmodule.cpp +++ b/mozilla/js/src/xpconnect/src/xpcmodule.cpp @@ -66,13 +66,3 @@ xpcModuleDtor(nsIModule* self) } NS_IMPL_NSGETMODULE_WITH_DTOR("xpconnect", components, xpcModuleDtor) - -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - diff --git a/mozilla/layout/build/nsLayoutModule.cpp b/mozilla/layout/build/nsLayoutModule.cpp index b2d90962547..8f5a3143cbb 100644 --- a/mozilla/layout/build/nsLayoutModule.cpp +++ b/mozilla/layout/build/nsLayoutModule.cpp @@ -411,13 +411,3 @@ nsLayoutModule::CanUnload(nsIComponentManager *aCompMgr, PRBool *okToUnload) *okToUnload = PR_FALSE; return NS_ERROR_FAILURE; } - -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - diff --git a/mozilla/mailnews/absync/build/nsAbSyncFactory.cpp b/mozilla/mailnews/absync/build/nsAbSyncFactory.cpp index d0c1fef062a..39df656b115 100644 --- a/mozilla/mailnews/absync/build/nsAbSyncFactory.cpp +++ b/mozilla/mailnews/absync/build/nsAbSyncFactory.cpp @@ -62,13 +62,3 @@ static nsModuleComponentInfo components[] = }; NS_IMPL_NSGETMODULE("nsAbSyncModule", components) - -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - diff --git a/mozilla/mailnews/addrbook/src/nsAddressBook.cpp b/mozilla/mailnews/addrbook/src/nsAddressBook.cpp index 45ecf6de23b..8fc62f83935 100644 --- a/mozilla/mailnews/addrbook/src/nsAddressBook.cpp +++ b/mozilla/mailnews/addrbook/src/nsAddressBook.cpp @@ -1533,13 +1533,3 @@ NS_IMETHODIMP nsAddressBook::ImportAddressBook() } CMDLINEHANDLER_IMPL(nsAddressBook,"-addressbook","general.startup.addressbook","chrome://messenger/content/addressbook/addressbook.xul","Start with the addressbook.",NS_ADDRESSBOOKSTARTUPHANDLER_CONTRACTID,"Addressbook Startup Handler",PR_FALSE,"", PR_TRUE) - -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - diff --git a/mozilla/mailnews/base/src/nsMsgServiceProvider.cpp b/mozilla/mailnews/base/src/nsMsgServiceProvider.cpp index 370abd7284e..d71cedb1565 100644 --- a/mozilla/mailnews/base/src/nsMsgServiceProvider.cpp +++ b/mozilla/mailnews/base/src/nsMsgServiceProvider.cpp @@ -164,14 +164,3 @@ nsMsgServiceProviderService::LoadDataSource(const char *aURI) return rv; } - - -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - diff --git a/mozilla/mailnews/base/util/nsMsgUtils.cpp b/mozilla/mailnews/base/util/nsMsgUtils.cpp index 3478baa00eb..550b5719f27 100644 --- a/mozilla/mailnews/base/util/nsMsgUtils.cpp +++ b/mozilla/mailnews/base/util/nsMsgUtils.cpp @@ -390,13 +390,3 @@ PRBool NS_MsgStripRE(const char **stringP, PRUint32 *lengthP) return result; } - -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - diff --git a/mozilla/mailnews/db/msgdb/build/nsMsgDBFactory.cpp b/mozilla/mailnews/db/msgdb/build/nsMsgDBFactory.cpp index 41a26848eae..36e641534ba 100644 --- a/mozilla/mailnews/db/msgdb/build/nsMsgDBFactory.cpp +++ b/mozilla/mailnews/db/msgdb/build/nsMsgDBFactory.cpp @@ -282,13 +282,3 @@ extern "C" NS_EXPORT nsresult NSGetModule(nsIComponentManager *servMgr, gModule = module; // WARNING: Weak Reference return rv; } - -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - diff --git a/mozilla/mailnews/imap/build/nsImapFactory.cpp b/mozilla/mailnews/imap/build/nsImapFactory.cpp index 3f7b3beb825..ed9bda4593e 100644 --- a/mozilla/mailnews/imap/build/nsImapFactory.cpp +++ b/mozilla/mailnews/imap/build/nsImapFactory.cpp @@ -80,13 +80,3 @@ static nsModuleComponentInfo gComponents[] = { }; NS_IMPL_NSGETMODULE("IMAP factory", gComponents); - -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - diff --git a/mozilla/mailnews/import/eudora/src/nsEudoraWin32.cpp b/mozilla/mailnews/import/eudora/src/nsEudoraWin32.cpp index b2a1ea5840f..2c7e8545f1d 100644 --- a/mozilla/mailnews/import/eudora/src/nsEudoraWin32.cpp +++ b/mozilla/mailnews/import/eudora/src/nsEudoraWin32.cpp @@ -1442,13 +1442,3 @@ void nsEudoraWin32::ConvertPath( nsCString& str) str = path; } - -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - diff --git a/mozilla/mailnews/import/src/nsImportService.cpp b/mozilla/mailnews/import/src/nsImportService.cpp index 618c435bc91..e7c8bc89795 100644 --- a/mozilla/mailnews/import/src/nsImportService.cpp +++ b/mozilla/mailnews/import/src/nsImportService.cpp @@ -778,14 +778,3 @@ void nsImportModuleList::AddModule( const nsCID& cid, const char *pSupports, con IMPORT_LOG3( "* nsImportService registered import module: %s, %s, %s\n", (const char *)name, (const char *)desc, pSupports); #endif } - - -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - diff --git a/mozilla/mailnews/import/text/src/nsTextFactory.cpp b/mozilla/mailnews/import/text/src/nsTextFactory.cpp index 2c9a87a0eb7..0799ceeb078 100644 --- a/mozilla/mailnews/import/text/src/nsTextFactory.cpp +++ b/mozilla/mailnews/import/text/src/nsTextFactory.cpp @@ -82,13 +82,3 @@ textModuleDtor(nsIModule* self) NS_IMPL_NSGETMODULE_WITH_DTOR("nsTextImportModule", components, textModuleDtor) - -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - diff --git a/mozilla/mailnews/local/build/nsMsgLocalFactory.cpp b/mozilla/mailnews/local/build/nsMsgLocalFactory.cpp index a25949e19e8..ff442725766 100644 --- a/mozilla/mailnews/local/build/nsMsgLocalFactory.cpp +++ b/mozilla/mailnews/local/build/nsMsgLocalFactory.cpp @@ -138,13 +138,3 @@ static nsModuleComponentInfo gComponents[] = { NS_IMPL_NSGETMODULE("local mail services", gComponents); - -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - diff --git a/mozilla/mailnews/news/build/nsMsgNewsFactory.cpp b/mozilla/mailnews/news/build/nsMsgNewsFactory.cpp index 8e3cda88067..2426799fc6a 100644 --- a/mozilla/mailnews/news/build/nsMsgNewsFactory.cpp +++ b/mozilla/mailnews/news/build/nsMsgNewsFactory.cpp @@ -128,13 +128,3 @@ static nsModuleComponentInfo components[] = NS_IMPL_NSGETMODULE("nsMsgNewsModule", components) -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - - diff --git a/mozilla/modules/libimg/gifcom/nsGIFModule.cpp b/mozilla/modules/libimg/gifcom/nsGIFModule.cpp index d3101a2523a..c56761864cd 100644 --- a/mozilla/modules/libimg/gifcom/nsGIFModule.cpp +++ b/mozilla/modules/libimg/gifcom/nsGIFModule.cpp @@ -38,12 +38,3 @@ static nsModuleComponentInfo components[] = NS_IMPL_NSGETMODULE("nsGIFModule", components) -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - diff --git a/mozilla/modules/libimg/jpgcom/nsJPGModule.cpp b/mozilla/modules/libimg/jpgcom/nsJPGModule.cpp index 624af9ad838..2a2a8547443 100644 --- a/mozilla/modules/libimg/jpgcom/nsJPGModule.cpp +++ b/mozilla/modules/libimg/jpgcom/nsJPGModule.cpp @@ -38,13 +38,3 @@ static nsModuleComponentInfo components[] = }; NS_IMPL_NSGETMODULE("nsJPGModule", components) - -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - diff --git a/mozilla/modules/libimg/mngcom/nsMNGDecoder.cpp b/mozilla/modules/libimg/mngcom/nsMNGDecoder.cpp index 99ebb01dbd9..995ddcad5c3 100644 --- a/mozilla/modules/libimg/mngcom/nsMNGDecoder.cpp +++ b/mozilla/modules/libimg/mngcom/nsMNGDecoder.cpp @@ -454,13 +454,3 @@ MNGDecoder::ImgDAbort() return NS_OK; } - -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - diff --git a/mozilla/modules/libimg/pngcom/nsPNGModule.cpp b/mozilla/modules/libimg/pngcom/nsPNGModule.cpp index 6fe442d3714..1fcbf7ea3af 100644 --- a/mozilla/modules/libimg/pngcom/nsPNGModule.cpp +++ b/mozilla/modules/libimg/pngcom/nsPNGModule.cpp @@ -38,13 +38,3 @@ static nsModuleComponentInfo components[] = NS_IMPL_NSGETMODULE("nsPNGModule", components) - -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - diff --git a/mozilla/modules/libimg/src/xpcompat.cpp b/mozilla/modules/libimg/src/xpcompat.cpp index 228c0e067c6..07444320fc1 100644 --- a/mozilla/modules/libimg/src/xpcompat.cpp +++ b/mozilla/modules/libimg/src/xpcompat.cpp @@ -120,12 +120,3 @@ IL_ClearTimeout(void *timer_id) } -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - diff --git a/mozilla/modules/libjar/nsJAR.cpp b/mozilla/modules/libjar/nsJAR.cpp index c71fdf97fd3..0bd8a7799f4 100644 --- a/mozilla/modules/libjar/nsJAR.cpp +++ b/mozilla/modules/libjar/nsJAR.cpp @@ -1375,13 +1375,3 @@ nsZipReaderCache::Observe(nsISupports *aSubject, } //////////////////////////////////////////////////////////////////////////////// - -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - diff --git a/mozilla/modules/libpref/src/nsPref.cpp b/mozilla/modules/libpref/src/nsPref.cpp index 65164eaa783..cfb707c3e87 100644 --- a/mozilla/modules/libpref/src/nsPref.cpp +++ b/mozilla/modules/libpref/src/nsPref.cpp @@ -1970,13 +1970,3 @@ extern "C" JSRuntime* PREF_GetJSRuntime() // and the entire implementation of the module object. // NS_IMPL_NSGETMODULE("nsPrefModule", components) - -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - diff --git a/mozilla/modules/plugin/base/src/nsPluginModule.cpp b/mozilla/modules/plugin/base/src/nsPluginModule.cpp index 063261e5d19..1a9eff8e039 100644 --- a/mozilla/modules/plugin/base/src/nsPluginModule.cpp +++ b/mozilla/modules/plugin/base/src/nsPluginModule.cpp @@ -53,14 +53,3 @@ nsPluginModuleDtor(nsIModule *self) NS_IMPL_NSGETMODULE_WITH_DTOR("nsPluginModule", gComponentInfo, nsPluginModuleDtor); - - -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - diff --git a/mozilla/modules/plugin/nglsrc/nsPluginModule.cpp b/mozilla/modules/plugin/nglsrc/nsPluginModule.cpp index 063261e5d19..1a9eff8e039 100644 --- a/mozilla/modules/plugin/nglsrc/nsPluginModule.cpp +++ b/mozilla/modules/plugin/nglsrc/nsPluginModule.cpp @@ -53,14 +53,3 @@ nsPluginModuleDtor(nsIModule *self) NS_IMPL_NSGETMODULE_WITH_DTOR("nsPluginModule", gComponentInfo, nsPluginModuleDtor); - - -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - diff --git a/mozilla/netwerk/build/nsNetModule.cpp b/mozilla/netwerk/build/nsNetModule.cpp index 07832616510..4654fc609de 100644 --- a/mozilla/netwerk/build/nsNetModule.cpp +++ b/mozilla/netwerk/build/nsNetModule.cpp @@ -882,14 +882,3 @@ static nsModuleComponentInfo gNetModuleInfo[] = { NS_IMPL_NSGETMODULE_WITH_DTOR("necko core and primary protocols", gNetModuleInfo, nsNeckoShutdown) - - -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - diff --git a/mozilla/netwerk/build2/nsNetModule2.cpp b/mozilla/netwerk/build2/nsNetModule2.cpp index 3785ad7d950..17e0cf49712 100644 --- a/mozilla/netwerk/build2/nsNetModule2.cpp +++ b/mozilla/netwerk/build2/nsNetModule2.cpp @@ -63,13 +63,3 @@ static nsModuleComponentInfo gNetModuleInfo[] = { }; NS_IMPL_NSGETMODULE("necko secondary protocols", gNetModuleInfo) - -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - diff --git a/mozilla/parser/htmlparser/src/nsParserModule.cpp b/mozilla/parser/htmlparser/src/nsParserModule.cpp index c3352f8265c..21bf64646ee 100644 --- a/mozilla/parser/htmlparser/src/nsParserModule.cpp +++ b/mozilla/parser/htmlparser/src/nsParserModule.cpp @@ -356,14 +356,3 @@ extern "C" NS_EXPORT nsresult NSGetModule(nsIComponentManager *servMgr, gModule = m; // WARNING: Weak Reference return rv; } - - -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - diff --git a/mozilla/profile/src/nsProfileFactory.cpp b/mozilla/profile/src/nsProfileFactory.cpp index b4e980406c0..4d7e8ab63de 100644 --- a/mozilla/profile/src/nsProfileFactory.cpp +++ b/mozilla/profile/src/nsProfileFactory.cpp @@ -36,13 +36,3 @@ static nsModuleComponentInfo components[] = }; NS_IMPL_NSGETMODULE("nsProfileModule", components); - -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - diff --git a/mozilla/rdf/build/nsRDFModule.cpp b/mozilla/rdf/build/nsRDFModule.cpp index ce662e9e985..2b1f4a833e0 100644 --- a/mozilla/rdf/build/nsRDFModule.cpp +++ b/mozilla/rdf/build/nsRDFModule.cpp @@ -152,13 +152,3 @@ static nsModuleComponentInfo components[] = }; NS_IMPL_NSGETMODULE("nsRDFModule", components); - -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - diff --git a/mozilla/rdf/chrome/build/nsChromeFactory.cpp b/mozilla/rdf/chrome/build/nsChromeFactory.cpp index 43fc2e282a8..4b25c4767af 100644 --- a/mozilla/rdf/chrome/build/nsChromeFactory.cpp +++ b/mozilla/rdf/chrome/build/nsChromeFactory.cpp @@ -53,13 +53,3 @@ static nsModuleComponentInfo components[] = NS_IMPL_NSGETMODULE("nsChromeModule", components); - -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - diff --git a/mozilla/uriloader/build/nsURILoaderModule.cpp b/mozilla/uriloader/build/nsURILoaderModule.cpp index f9e70e4ac84..6d853d071eb 100644 --- a/mozilla/uriloader/build/nsURILoaderModule.cpp +++ b/mozilla/uriloader/build/nsURILoaderModule.cpp @@ -62,13 +62,3 @@ static nsModuleComponentInfo components[] = { // and the entire implementation of the module object. // NS_IMPL_NSGETMODULE("nsURILoaderModule", components) - -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - diff --git a/mozilla/view/src/nsViewFactory.cpp b/mozilla/view/src/nsViewFactory.cpp index 16b3561bc15..fc4cca2b7e0 100644 --- a/mozilla/view/src/nsViewFactory.cpp +++ b/mozilla/view/src/nsViewFactory.cpp @@ -339,13 +339,3 @@ nsViewModule::CanUnload(nsIComponentManager *aCompMgr, PRBool *okToUnload) } ////////////////////////////////////////////////////////////////////// - -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - diff --git a/mozilla/widget/src/build/nsWinWidgetFactory.cpp b/mozilla/widget/src/build/nsWinWidgetFactory.cpp index 7402667e39b..5207a1ec2a6 100644 --- a/mozilla/widget/src/build/nsWinWidgetFactory.cpp +++ b/mozilla/widget/src/build/nsWinWidgetFactory.cpp @@ -264,13 +264,3 @@ NSGetFactory(nsISupports* serviceMgr, - -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - diff --git a/mozilla/xpcom/base/nsConsoleService.cpp b/mozilla/xpcom/base/nsConsoleService.cpp index a944dbeaec0..2dbae67ea8d 100644 --- a/mozilla/xpcom/base/nsConsoleService.cpp +++ b/mozilla/xpcom/base/nsConsoleService.cpp @@ -305,13 +305,3 @@ nsConsoleService::GetProxyForListener(nsIConsoleListener* aListener, (void**) aProxy); return rv; } - -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - diff --git a/mozilla/xpfe/appshell/src/nsAppShellFactory.cpp b/mozilla/xpfe/appshell/src/nsAppShellFactory.cpp index e8fb8fb7166..86b11f4bec8 100644 --- a/mozilla/xpfe/appshell/src/nsAppShellFactory.cpp +++ b/mozilla/xpfe/appshell/src/nsAppShellFactory.cpp @@ -112,13 +112,3 @@ static nsModuleComponentInfo gAppShellModuleInfo[] = NS_IMPL_NSGETMODULE("appshell", gAppShellModuleInfo) - -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - diff --git a/mozilla/xpfe/components/build/nsModule.cpp b/mozilla/xpfe/components/build/nsModule.cpp index 2f30dcd5726..f49bc090689 100644 --- a/mozilla/xpfe/components/build/nsModule.cpp +++ b/mozilla/xpfe/components/build/nsModule.cpp @@ -95,13 +95,3 @@ static nsModuleComponentInfo components[] = { }; NS_IMPL_NSGETMODULE("application", components) - -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - diff --git a/mozilla/xpfe/components/find/src/nsFindComponent.cpp b/mozilla/xpfe/components/find/src/nsFindComponent.cpp index e36a029e249..fee20544a84 100644 --- a/mozilla/xpfe/components/find/src/nsFindComponent.cpp +++ b/mozilla/xpfe/components/find/src/nsFindComponent.cpp @@ -717,12 +717,4 @@ static nsModuleComponentInfo components[] = { NS_IMPL_NSGETMODULE("nsFindComponent", components) -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - +NS_IMPL_IAPPSHELLCOMPONENT( nsFindComponent, nsIFindComponent, NS_IFINDCOMPONENT_CONTRACTID, 0 ) diff --git a/mozilla/xpfe/components/shistory/src/nsSHistoryModule.cpp b/mozilla/xpfe/components/shistory/src/nsSHistoryModule.cpp index 12198c6c300..0a7ba6cda10 100644 --- a/mozilla/xpfe/components/shistory/src/nsSHistoryModule.cpp +++ b/mozilla/xpfe/components/shistory/src/nsSHistoryModule.cpp @@ -57,13 +57,3 @@ static nsModuleComponentInfo gSHistoryModuleInfo[] = }; NS_IMPL_NSGETMODULE("Session History Module", gSHistoryModuleInfo) - -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - diff --git a/mozilla/xpinstall/src/nsXPInstallManager.cpp b/mozilla/xpinstall/src/nsXPInstallManager.cpp index bb24045766c..8b921024b17 100644 --- a/mozilla/xpinstall/src/nsXPInstallManager.cpp +++ b/mozilla/xpinstall/src/nsXPInstallManager.cpp @@ -965,13 +965,3 @@ nsXPInstallManager::LogComment(const PRUnichar* comment) return NS_OK; } - -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif - diff --git a/mozilla/xpinstall/wizard/windows/setuprsc/setuprsc.cpp b/mozilla/xpinstall/wizard/windows/setuprsc/setuprsc.cpp index c4995882a77..9800efd9b9d 100644 --- a/mozilla/xpinstall/wizard/windows/setuprsc/setuprsc.cpp +++ b/mozilla/xpinstall/wizard/windows/setuprsc/setuprsc.cpp @@ -27,13 +27,3 @@ int FAR PASCAL LibMain(HINSTANCE hInstance, WORD wDataSeg, WORD cbHeapSize, LPST { return(1); } - -#ifdef XP_WIN32 - //in addition to returning a version number for this module, - //this also provides a convenient hook for the preloader - //to keep (some if not all) of the module resident. -extern "C" __declspec(dllexport) float GetVersionNumber(void) { - return 1.0; -} -#endif -