diff --git a/mozilla/caps/src/nsSecurityManagerFactory.cpp b/mozilla/caps/src/nsSecurityManagerFactory.cpp index 230bcf42d8b..846c581b196 100644 --- a/mozilla/caps/src/nsSecurityManagerFactory.cpp +++ b/mozilla/caps/src/nsSecurityManagerFactory.cpp @@ -277,7 +277,7 @@ extern "C" NS_EXPORT nsresult NSGetModule(nsIComponentManager *servMgr, nsresult rv = NS_OK; NS_ENSURE_ARG_POINTER(return_cobj); - NS_ENSURE_NOT(gModule, NS_ERROR_FAILURE); + NS_ENSURE_FALSE(gModule, NS_ERROR_FAILURE); // Create and initialize the module instance nsSecurityManagerModule *m = new nsSecurityManagerModule(); diff --git a/mozilla/chrome/src/nsChromeFactory.cpp b/mozilla/chrome/src/nsChromeFactory.cpp index 7510649c602..15e306a9821 100644 --- a/mozilla/chrome/src/nsChromeFactory.cpp +++ b/mozilla/chrome/src/nsChromeFactory.cpp @@ -268,7 +268,7 @@ extern "C" NS_EXPORT nsresult NSGetModule(nsIComponentManager *servMgr, nsresult rv = NS_OK; NS_ENSURE_ARG_POINTER(return_cobj); - NS_ENSURE_NOT(gModule, NS_ERROR_FAILURE); + NS_ENSURE_FALSE(gModule, NS_ERROR_FAILURE); // Create and initialize the module instance nsChromeModule *m = new nsChromeModule(); diff --git a/mozilla/extensions/cookie/nsCookieService.cpp b/mozilla/extensions/cookie/nsCookieService.cpp index 15cb7b61a04..ed677c6b03d 100644 --- a/mozilla/extensions/cookie/nsCookieService.cpp +++ b/mozilla/extensions/cookie/nsCookieService.cpp @@ -433,7 +433,7 @@ extern "C" NS_EXPORT nsresult NSGetModule(nsIComponentManager *servMgr, nsresult rv = NS_OK; NS_ENSURE_ARG_POINTER(return_cobj); - NS_ENSURE_NOT(gModule, NS_ERROR_FAILURE); + NS_ENSURE_FALSE(gModule, NS_ERROR_FAILURE); // Create and initialize the module instance nsCookieServiceModule *m = new nsCookieServiceModule(); diff --git a/mozilla/extensions/pics/src/nsPICS.cpp b/mozilla/extensions/pics/src/nsPICS.cpp index 4a459d02ae7..c7abb30a2f1 100644 --- a/mozilla/extensions/pics/src/nsPICS.cpp +++ b/mozilla/extensions/pics/src/nsPICS.cpp @@ -1789,7 +1789,7 @@ extern "C" NS_EXPORT nsresult NSGetModule(nsIComponentManager *servMgr, nsresult rv = NS_OK; NS_ENSURE_ARG_POINTER(return_cobj); - NS_ENSURE_NOT(gModule, NS_ERROR_FAILURE); + NS_ENSURE_FALSE(gModule, NS_ERROR_FAILURE); // Create and initialize the module instance nsPICSModule *m = new nsPICSModule(); diff --git a/mozilla/extensions/wallet/build/nsWalletViewerFactory.cpp b/mozilla/extensions/wallet/build/nsWalletViewerFactory.cpp index b44b643c592..f65fb2398e5 100644 --- a/mozilla/extensions/wallet/build/nsWalletViewerFactory.cpp +++ b/mozilla/extensions/wallet/build/nsWalletViewerFactory.cpp @@ -377,7 +377,7 @@ extern "C" NS_EXPORT nsresult NSGetModule(nsIComponentManager *servMgr, nsresult rv = NS_OK; NS_ENSURE_ARG_POINTER(return_cobj); - NS_ENSURE_NOT(gModule, NS_ERROR_FAILURE); + NS_ENSURE_FALSE(gModule, NS_ERROR_FAILURE); // Create and initialize the module instance nsWalletViewerModule *m = new nsWalletViewerModule(); diff --git a/mozilla/extensions/wallet/src/nsWalletFactory.cpp b/mozilla/extensions/wallet/src/nsWalletFactory.cpp index 60a145950b9..8af5a0fb424 100644 --- a/mozilla/extensions/wallet/src/nsWalletFactory.cpp +++ b/mozilla/extensions/wallet/src/nsWalletFactory.cpp @@ -260,7 +260,7 @@ extern "C" NS_EXPORT nsresult NSGetModule(nsIComponentManager *servMgr, nsresult rv = NS_OK; NS_ENSURE_ARG_POINTER(return_cobj); - NS_ENSURE_NOT(gModule, NS_ERROR_FAILURE); + NS_ENSURE_FALSE(gModule, NS_ERROR_FAILURE); // Create and initialize the module instance nsWalletModule *m = new nsWalletModule(); diff --git a/mozilla/intl/compatibility/macbuild/intlcmptIDL.mcp b/mozilla/intl/compatibility/macbuild/intlcmptIDL.mcp index 668c5fd80c0..198a824d0c7 100644 Binary files a/mozilla/intl/compatibility/macbuild/intlcmptIDL.mcp and b/mozilla/intl/compatibility/macbuild/intlcmptIDL.mcp differ diff --git a/mozilla/intl/compatibility/src/nsI18nCompatibility.cpp b/mozilla/intl/compatibility/src/nsI18nCompatibility.cpp index 558c4b41ed6..7ed6fc25c9c 100644 --- a/mozilla/intl/compatibility/src/nsI18nCompatibility.cpp +++ b/mozilla/intl/compatibility/src/nsI18nCompatibility.cpp @@ -121,7 +121,7 @@ extern "C" NS_EXPORT nsresult NSGetModule(nsIComponentManager * compMgr, nsresult rv = NS_OK; NS_ENSURE_ARG_POINTER(return_cobj); - NS_ENSURE_NOT(gModule, NS_ERROR_FAILURE); + NS_ENSURE_FALSE(gModule, NS_ERROR_FAILURE); // Create an initialize the module instance nsI18nCompModule * m = new nsI18nCompModule(); diff --git a/mozilla/intl/strres/src/nsStringBundle.cpp b/mozilla/intl/strres/src/nsStringBundle.cpp index e63a930a0d9..717ef27581f 100644 --- a/mozilla/intl/strres/src/nsStringBundle.cpp +++ b/mozilla/intl/strres/src/nsStringBundle.cpp @@ -493,7 +493,7 @@ extern "C" NS_EXPORT nsresult NSGetModule(nsIComponentManager * compMgr, nsresult rv = NS_OK; NS_ENSURE_ARG_POINTER(return_cobj); - NS_ENSURE_NOT(gModule, NS_ERROR_FAILURE); + NS_ENSURE_FALSE(gModule, NS_ERROR_FAILURE); // Create an initialize the module instance nsSBModule * m = new nsSBModule(); diff --git a/mozilla/intl/uconv/ucvcn/nsUCvCnModule.cpp b/mozilla/intl/uconv/ucvcn/nsUCvCnModule.cpp index cf648a625dc..ecc351fc4aa 100644 --- a/mozilla/intl/uconv/ucvcn/nsUCvCnModule.cpp +++ b/mozilla/intl/uconv/ucvcn/nsUCvCnModule.cpp @@ -205,7 +205,7 @@ extern "C" NS_EXPORT nsresult NSGetModule(nsIComponentManager * compMgr, nsresult rv = NS_OK; NS_ENSURE_ARG_POINTER(return_cobj); - NS_ENSURE_NOT(gModule, NS_ERROR_FAILURE); + NS_ENSURE_FALSE(gModule, NS_ERROR_FAILURE); // Create an initialize the module instance nsConverterModule * m = new nsConverterModule(); diff --git a/mozilla/intl/uconv/ucvja/nsUCvJaModule.cpp b/mozilla/intl/uconv/ucvja/nsUCvJaModule.cpp index 9cbed179fc9..35a7db692f5 100644 --- a/mozilla/intl/uconv/ucvja/nsUCvJaModule.cpp +++ b/mozilla/intl/uconv/ucvja/nsUCvJaModule.cpp @@ -239,7 +239,7 @@ extern "C" NS_EXPORT nsresult NSGetModule(nsIComponentManager * compMgr, nsresult rv = NS_OK; NS_ENSURE_ARG_POINTER(return_cobj); - NS_ENSURE_NOT(gModule, NS_ERROR_FAILURE); + NS_ENSURE_FALSE(gModule, NS_ERROR_FAILURE); // Create an initialize the module instance nsConverterModule * m = new nsConverterModule(); diff --git a/mozilla/intl/uconv/ucvko/nsUCvKoModule.cpp b/mozilla/intl/uconv/ucvko/nsUCvKoModule.cpp index d1993b10848..44f66e41590 100644 --- a/mozilla/intl/uconv/ucvko/nsUCvKoModule.cpp +++ b/mozilla/intl/uconv/ucvko/nsUCvKoModule.cpp @@ -173,7 +173,7 @@ extern "C" NS_EXPORT nsresult NSGetModule(nsIComponentManager * compMgr, nsresult rv = NS_OK; NS_ENSURE_ARG_POINTER(return_cobj); - NS_ENSURE_NOT(gModule, NS_ERROR_FAILURE); + NS_ENSURE_FALSE(gModule, NS_ERROR_FAILURE); // Create an initialize the module instance nsConverterModule * m = new nsConverterModule(); diff --git a/mozilla/intl/uconv/ucvlatin/nsUCvLatinModule.cpp b/mozilla/intl/uconv/ucvlatin/nsUCvLatinModule.cpp index de57662a32d..c05c41a242b 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUCvLatinModule.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsUCvLatinModule.cpp @@ -868,7 +868,7 @@ extern "C" NS_EXPORT nsresult NSGetModule(nsIComponentManager * compMgr, nsresult rv = NS_OK; NS_ENSURE_ARG_POINTER(return_cobj); - NS_ENSURE_NOT(gModule, NS_ERROR_FAILURE); + NS_ENSURE_FALSE(gModule, NS_ERROR_FAILURE); // Create an initialize the module instance nsConverterModule * m = new nsConverterModule(); diff --git a/mozilla/intl/uconv/ucvtw/nsUCvTwModule.cpp b/mozilla/intl/uconv/ucvtw/nsUCvTwModule.cpp index cace911330c..4bfab2e1306 100644 --- a/mozilla/intl/uconv/ucvtw/nsUCvTwModule.cpp +++ b/mozilla/intl/uconv/ucvtw/nsUCvTwModule.cpp @@ -163,7 +163,7 @@ extern "C" NS_EXPORT nsresult NSGetModule(nsIComponentManager * compMgr, nsresult rv = NS_OK; NS_ENSURE_ARG_POINTER(return_cobj); - NS_ENSURE_NOT(gModule, NS_ERROR_FAILURE); + NS_ENSURE_FALSE(gModule, NS_ERROR_FAILURE); // Create an initialize the module instance nsConverterModule * m = new nsConverterModule(); diff --git a/mozilla/intl/uconv/ucvtw2/nsUCvTw2Module.cpp b/mozilla/intl/uconv/ucvtw2/nsUCvTw2Module.cpp index dd243f17a01..fe2351ba5be 100644 --- a/mozilla/intl/uconv/ucvtw2/nsUCvTw2Module.cpp +++ b/mozilla/intl/uconv/ucvtw2/nsUCvTw2Module.cpp @@ -253,7 +253,7 @@ extern "C" NS_EXPORT nsresult NSGetModule(nsIComponentManager * compMgr, nsresult rv = NS_OK; NS_ENSURE_ARG_POINTER(return_cobj); - NS_ENSURE_NOT(gModule, NS_ERROR_FAILURE); + NS_ENSURE_FALSE(gModule, NS_ERROR_FAILURE); // Create an initialize the module instance nsConverterModule * m = new nsConverterModule(); diff --git a/mozilla/js/src/xpconnect/tests/components/xpctest_module.cpp b/mozilla/js/src/xpconnect/tests/components/xpctest_module.cpp index b98a581dab5..74c39bcc7f3 100644 --- a/mozilla/js/src/xpconnect/tests/components/xpctest_module.cpp +++ b/mozilla/js/src/xpconnect/tests/components/xpctest_module.cpp @@ -469,7 +469,7 @@ extern "C" NS_EXPORT nsresult NSGetModule(nsIComponentManager *servMgr, nsresult rv = NS_OK; NS_ENSURE_ARG_POINTER(return_cobj); - NS_ENSURE_NOT(gModule, NS_ERROR_FAILURE); + NS_ENSURE_FALSE(gModule, NS_ERROR_FAILURE); // Create and initialize the module instance nsXPCTestModule *m = new nsXPCTestModule(); diff --git a/mozilla/modules/libjar/nsJARFactory.cpp b/mozilla/modules/libjar/nsJARFactory.cpp index 101e31276a4..b62e4d523ad 100644 --- a/mozilla/modules/libjar/nsJARFactory.cpp +++ b/mozilla/modules/libjar/nsJARFactory.cpp @@ -269,7 +269,7 @@ extern "C" NS_EXPORT nsresult NSGetModule(nsIComponentManager *servMgr, nsresult rv = NS_OK; NS_ENSURE_ARG_POINTER(return_cobj); - NS_ENSURE_NOT(gModule, NS_ERROR_FAILURE); + NS_ENSURE_FALSE(gModule, NS_ERROR_FAILURE); // Create and initialize the module instance nsJARModule *m = new nsJARModule(); diff --git a/mozilla/modules/libpref/src/nsPref.cpp b/mozilla/modules/libpref/src/nsPref.cpp index 9e6cd2a0b06..5ed35f12bec 100644 --- a/mozilla/modules/libpref/src/nsPref.cpp +++ b/mozilla/modules/libpref/src/nsPref.cpp @@ -1421,7 +1421,7 @@ extern "C" NS_EXPORT nsresult NSGetModule(nsIComponentManager *servMgr, nsresult rv = NS_OK; NS_ENSURE_ARG_POINTER(return_cobj); - NS_ENSURE_NOT(gModule, NS_ERROR_FAILURE); + NS_ENSURE_FALSE(gModule, NS_ERROR_FAILURE); // Create an initialize the layout module instance nsPrefModule *m = new nsPrefModule(); diff --git a/mozilla/modules/oji/src/nsCJVMManagerFactory.cpp b/mozilla/modules/oji/src/nsCJVMManagerFactory.cpp index 3c307f4b885..ac943edb260 100644 --- a/mozilla/modules/oji/src/nsCJVMManagerFactory.cpp +++ b/mozilla/modules/oji/src/nsCJVMManagerFactory.cpp @@ -254,7 +254,7 @@ extern "C" NS_EXPORT nsresult NSGetModule(nsIComponentManager *servMgr, nsresult rv = NS_OK; NS_ENSURE_ARG_POINTER(return_cobj); - NS_ENSURE_NOT(gModule, NS_ERROR_FAILURE); + NS_ENSURE_FALSE(gModule, NS_ERROR_FAILURE); // Create and initialize the module instance nsCJVMManagerModule *m = new nsCJVMManagerModule(); diff --git a/mozilla/netwerk/mime/src/nsMIMEServiceFactory.cpp b/mozilla/netwerk/mime/src/nsMIMEServiceFactory.cpp index 62289bba254..ea9a5b21ba2 100644 --- a/mozilla/netwerk/mime/src/nsMIMEServiceFactory.cpp +++ b/mozilla/netwerk/mime/src/nsMIMEServiceFactory.cpp @@ -275,7 +275,7 @@ extern "C" NS_EXPORT nsresult NSGetModule(nsIComponentManager *servMgr, nsresult rv = NS_OK; NS_ENSURE_ARG_POINTER(return_cobj); - NS_ENSURE_NOT(gModule, NS_ERROR_FAILURE); + NS_ENSURE_FALSE(gModule, NS_ERROR_FAILURE); // Create and initialize the module instance nsMIMEServiceModule *m = new nsMIMEServiceModule(); diff --git a/mozilla/netwerk/streamconv/converters/nsConvFactories.cpp b/mozilla/netwerk/streamconv/converters/nsConvFactories.cpp index 20e13413526..37d64869e7f 100644 --- a/mozilla/netwerk/streamconv/converters/nsConvFactories.cpp +++ b/mozilla/netwerk/streamconv/converters/nsConvFactories.cpp @@ -296,7 +296,7 @@ extern "C" NS_EXPORT nsresult NSGetModule(nsIComponentManager *servMgr, nsresult rv = NS_OK; NS_ENSURE_ARG_POINTER(return_cobj); - NS_ENSURE_NOT(gModule, NS_ERROR_FAILURE); + NS_ENSURE_FALSE(gModule, NS_ERROR_FAILURE); // Create and initialize the module instance nsConvModule *m = new nsConvModule(); diff --git a/mozilla/netwerk/streamconv/src/nsStreamConvServiceFactory.cpp b/mozilla/netwerk/streamconv/src/nsStreamConvServiceFactory.cpp index 20c91ae2413..7e5b997d41d 100644 --- a/mozilla/netwerk/streamconv/src/nsStreamConvServiceFactory.cpp +++ b/mozilla/netwerk/streamconv/src/nsStreamConvServiceFactory.cpp @@ -254,7 +254,7 @@ extern "C" NS_EXPORT nsresult NSGetModule(nsIComponentManager *servMgr, nsresult rv = NS_OK; NS_ENSURE_ARG_POINTER(return_cobj); - NS_ENSURE_NOT(gModule, NS_ERROR_FAILURE); + NS_ENSURE_FALSE(gModule, NS_ERROR_FAILURE); // Create and initialize the module instance nsStreamConvModule *m = new nsStreamConvModule(); diff --git a/mozilla/profile/pref-migrator/src/nsPrefMigrationFactory.cpp b/mozilla/profile/pref-migrator/src/nsPrefMigrationFactory.cpp index 398e52bf30e..f69e31a49eb 100644 --- a/mozilla/profile/pref-migrator/src/nsPrefMigrationFactory.cpp +++ b/mozilla/profile/pref-migrator/src/nsPrefMigrationFactory.cpp @@ -239,7 +239,7 @@ extern "C" NS_EXPORT nsresult NSGetModule(nsIComponentManager *servMgr, nsresult rv = NS_OK; NS_ENSURE_ARG_POINTER(return_cobj); - NS_ENSURE_NOT(gModule, NS_ERROR_FAILURE); + NS_ENSURE_FALSE(gModule, NS_ERROR_FAILURE); // Create and initialize the module instance nsPrefMigrationModule *m = new nsPrefMigrationModule(); diff --git a/mozilla/profile/src/nsProfileFactory.cpp b/mozilla/profile/src/nsProfileFactory.cpp index 013d5677a3c..3f35fe8e8e5 100644 --- a/mozilla/profile/src/nsProfileFactory.cpp +++ b/mozilla/profile/src/nsProfileFactory.cpp @@ -254,7 +254,7 @@ extern "C" NS_EXPORT nsresult NSGetModule(nsIComponentManager *servMgr, nsresult rv = NS_OK; NS_ENSURE_ARG_POINTER(return_cobj); - NS_ENSURE_NOT(gModule, NS_ERROR_FAILURE); + NS_ENSURE_FALSE(gModule, NS_ERROR_FAILURE); // Create an initialize the layout module instance nsProfileModule *m = new nsProfileModule(); diff --git a/mozilla/rdf/chrome/build/nsChromeFactory.cpp b/mozilla/rdf/chrome/build/nsChromeFactory.cpp index 7510649c602..15e306a9821 100644 --- a/mozilla/rdf/chrome/build/nsChromeFactory.cpp +++ b/mozilla/rdf/chrome/build/nsChromeFactory.cpp @@ -268,7 +268,7 @@ extern "C" NS_EXPORT nsresult NSGetModule(nsIComponentManager *servMgr, nsresult rv = NS_OK; NS_ENSURE_ARG_POINTER(return_cobj); - NS_ENSURE_NOT(gModule, NS_ERROR_FAILURE); + NS_ENSURE_FALSE(gModule, NS_ERROR_FAILURE); // Create and initialize the module instance nsChromeModule *m = new nsChromeModule(); diff --git a/mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp b/mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp index a14440ead07..d1fd665d9e3 100644 --- a/mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp +++ b/mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp @@ -3966,7 +3966,7 @@ extern "C" NS_EXPORT nsresult NSGetModule(nsIComponentManager *servMgr, nsresult rv = NS_OK; NS_ENSURE_ARG_POINTER(return_cobj); - NS_ENSURE_NOT(gModule, NS_ERROR_FAILURE); + NS_ENSURE_FALSE(gModule, NS_ERROR_FAILURE); // Create and initialize the module instance nsBookmarksServiceModule *m = new nsBookmarksServiceModule(); diff --git a/mozilla/xpfe/components/directory/nsDirectoryViewer.cpp b/mozilla/xpfe/components/directory/nsDirectoryViewer.cpp index 334cb38f8b6..f92f8864ef7 100644 --- a/mozilla/xpfe/components/directory/nsDirectoryViewer.cpp +++ b/mozilla/xpfe/components/directory/nsDirectoryViewer.cpp @@ -1212,7 +1212,7 @@ extern "C" NS_EXPORT nsresult NSGetModule(nsIComponentManager *servMgr, nsresult rv = NS_OK; NS_ENSURE_ARG_POINTER(return_cobj); - NS_ENSURE_NOT(gModule, NS_ERROR_FAILURE); + NS_ENSURE_FALSE(gModule, NS_ERROR_FAILURE); // Create and initialize the module instance nsDirectoryViewerModule *m = new nsDirectoryViewerModule(); diff --git a/mozilla/xpfe/components/history/src/nsGlobalHistory.cpp b/mozilla/xpfe/components/history/src/nsGlobalHistory.cpp index 13e5c77205f..f5c0567e040 100644 --- a/mozilla/xpfe/components/history/src/nsGlobalHistory.cpp +++ b/mozilla/xpfe/components/history/src/nsGlobalHistory.cpp @@ -1716,7 +1716,7 @@ extern "C" NS_EXPORT nsresult NSGetModule(nsIComponentManager *servMgr, // Preconditions NS_ENSURE_ARG_POINTER(return_cobj); - NS_ENSURE_NOT(gModule, NS_ERROR_FAILURE); + NS_ENSURE_FALSE(gModule, NS_ERROR_FAILURE); // Create an initialize the layout module instance nsGlobalHistoryModule *m = new nsGlobalHistoryModule(); diff --git a/mozilla/xpfe/components/regviewer/nsRegistryDataSource.cpp b/mozilla/xpfe/components/regviewer/nsRegistryDataSource.cpp index cd192a2942f..1e33756cb0e 100644 --- a/mozilla/xpfe/components/regviewer/nsRegistryDataSource.cpp +++ b/mozilla/xpfe/components/regviewer/nsRegistryDataSource.cpp @@ -1042,7 +1042,7 @@ extern "C" NS_EXPORT nsresult NSGetModule(nsIComponentManager *servMgr, nsresult rv = NS_OK; NS_ENSURE_ARG_POINTER(return_cobj); - NS_ENSURE_NOT(gModule, NS_ERROR_FAILURE); + NS_ENSURE_FALSE(gModule, NS_ERROR_FAILURE); // Create and initialize the module instance nsRegistryDataSourceModule *m = new nsRegistryDataSourceModule(); diff --git a/mozilla/xpfe/components/related/src/nsRelatedLinksHandler.cpp b/mozilla/xpfe/components/related/src/nsRelatedLinksHandler.cpp index 4b9aab23e49..52785a7f759 100644 --- a/mozilla/xpfe/components/related/src/nsRelatedLinksHandler.cpp +++ b/mozilla/xpfe/components/related/src/nsRelatedLinksHandler.cpp @@ -1270,7 +1270,7 @@ extern "C" NS_EXPORT nsresult NSGetModule(nsIComponentManager *servMgr, nsresult rv = NS_OK; NS_ENSURE_ARG_POINTER(return_cobj); - NS_ENSURE_NOT(gModule, NS_ERROR_FAILURE); + NS_ENSURE_FALSE(gModule, NS_ERROR_FAILURE); // Create and initialize the module instance nsRelatedLinksModule *m = new nsRelatedLinksModule(); diff --git a/mozilla/xpfe/components/search/src/nsRegisterSearch.cpp b/mozilla/xpfe/components/search/src/nsRegisterSearch.cpp index 832bc06e032..8aee09e9946 100755 --- a/mozilla/xpfe/components/search/src/nsRegisterSearch.cpp +++ b/mozilla/xpfe/components/search/src/nsRegisterSearch.cpp @@ -271,7 +271,7 @@ extern "C" NS_EXPORT nsresult NSGetModule(nsIComponentManager *servMgr, nsresult rv = NS_OK; NS_ENSURE_ARG_POINTER(return_cobj); - NS_ENSURE_NOT(gModule, NS_ERROR_FAILURE); + NS_ENSURE_FALSE(gModule, NS_ERROR_FAILURE); // Create and initialize the module instance nsSearchModule *m = new nsSearchModule(); diff --git a/mozilla/xpinstall/notifier/nsXPIFlash.cpp b/mozilla/xpinstall/notifier/nsXPIFlash.cpp index 1d23ff8c4f2..5e38dca0726 100644 --- a/mozilla/xpinstall/notifier/nsXPIFlash.cpp +++ b/mozilla/xpinstall/notifier/nsXPIFlash.cpp @@ -898,7 +898,7 @@ extern "C" NS_EXPORT nsresult NSGetModule(nsIComponentManager *servMgr, nsresult rv = NS_OK; NS_ENSURE_ARG_POINTER(return_cobj); - NS_ENSURE_NOT(gModule, NS_ERROR_FAILURE); + NS_ENSURE_FALSE(gModule, NS_ERROR_FAILURE); // Create and initialize the module instance nsXPINotifierModule *m = new nsXPINotifierModule(); diff --git a/mozilla/xpinstall/src/nsSoftwareUpdate.cpp b/mozilla/xpinstall/src/nsSoftwareUpdate.cpp index e615032c8ca..6efdd533a84 100644 --- a/mozilla/xpinstall/src/nsSoftwareUpdate.cpp +++ b/mozilla/xpinstall/src/nsSoftwareUpdate.cpp @@ -775,7 +775,7 @@ extern "C" NS_EXPORT nsresult NSGetModule(nsIComponentManager *servMgr, nsresult rv = NS_OK; NS_ENSURE_ARG_POINTER(return_cobj); - NS_ENSURE_NOT(gModule, NS_ERROR_FAILURE); + NS_ENSURE_FALSE(gModule, NS_ERROR_FAILURE); // Create and initialize the module instance nsSoftwareUpdateModule *m = new nsSoftwareUpdateModule();