From 260b09f14778f78c330a184160b9ee0ed0d4d33a Mon Sep 17 00:00:00 2001 From: "bryner%brianryner.com" Date: Sun, 7 Sep 2003 21:37:51 +0000 Subject: [PATCH] Fix build on gcc 3.4 by removing extra semicolons (bug 218551). r/sr=dbaron, a=brendan. git-svn-id: svn://10.0.0.236/trunk@146613 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/accessible/build/nsAccessibilityFactory.cpp | 2 +- .../accessible/src/base/nsAccessibilityService.cpp | 2 +- .../accessible/src/base/nsAccessibleEventData.cpp | 2 +- mozilla/accessible/src/base/nsRootAccessible.cpp | 4 ++-- .../components/bookmarks/src/nsBookmarksService.cpp | 2 +- mozilla/browser/components/build/nsModule.cpp | 2 +- mozilla/calendar/libxpical/oeICalContainerImpl.cpp | 2 +- mozilla/calendar/libxpical/oeICalFactory.cpp | 12 ++++++------ mozilla/calendar/libxpical/oeICalImpl.cpp | 2 +- mozilla/calendar/libxpical/oeICalStartupHandler.cpp | 2 +- mozilla/caps/src/nsAggregatePrincipal.cpp | 4 ++-- mozilla/caps/src/nsCertificatePrincipal.cpp | 4 ++-- mozilla/caps/src/nsCodebasePrincipal.cpp | 4 ++-- mozilla/caps/src/nsSecurityManagerFactory.cpp | 2 +- mozilla/caps/src/nsSystemPrincipal.cpp | 4 ++-- 15 files changed, 25 insertions(+), 25 deletions(-) diff --git a/mozilla/accessible/build/nsAccessibilityFactory.cpp b/mozilla/accessible/build/nsAccessibilityFactory.cpp index c6d522130e9..54262e3aa4c 100644 --- a/mozilla/accessible/build/nsAccessibilityFactory.cpp +++ b/mozilla/accessible/build/nsAccessibilityFactory.cpp @@ -78,6 +78,6 @@ static const nsModuleComponentInfo components[] = }, }; -NS_IMPL_NSGETMODULE(nsAccessibilityModule, components); +NS_IMPL_NSGETMODULE(nsAccessibilityModule, components) diff --git a/mozilla/accessible/src/base/nsAccessibilityService.cpp b/mozilla/accessible/src/base/nsAccessibilityService.cpp index 3de20984510..809f0db5155 100644 --- a/mozilla/accessible/src/base/nsAccessibilityService.cpp +++ b/mozilla/accessible/src/base/nsAccessibilityService.cpp @@ -130,7 +130,7 @@ nsAccessibilityService::~nsAccessibilityService() } NS_IMPL_THREADSAFE_ISUPPORTS5(nsAccessibilityService, nsIAccessibilityService, nsIAccessibleRetrieval, - nsIObserver, nsIWebProgressListener, nsISupportsWeakReference); + nsIObserver, nsIWebProgressListener, nsISupportsWeakReference) // nsIObserver diff --git a/mozilla/accessible/src/base/nsAccessibleEventData.cpp b/mozilla/accessible/src/base/nsAccessibleEventData.cpp index 784a4d50b25..82aeecd9f62 100755 --- a/mozilla/accessible/src/base/nsAccessibleEventData.cpp +++ b/mozilla/accessible/src/base/nsAccessibleEventData.cpp @@ -38,7 +38,7 @@ #include "nsAccessibleEventData.h" -NS_IMPL_ISUPPORTS1(nsAccessibleEventData, nsIAccessibleEvent); +NS_IMPL_ISUPPORTS1(nsAccessibleEventData, nsIAccessibleEvent) nsAccessibleEventData::nsAccessibleEventData(PRUint32 aEventType, nsIAccessible *aAccessible, nsIAccessibleDocument *aDocAccessible, diff --git a/mozilla/accessible/src/base/nsRootAccessible.cpp b/mozilla/accessible/src/base/nsRootAccessible.cpp index 2c5aa431be6..a212e5eb146 100644 --- a/mozilla/accessible/src/base/nsRootAccessible.cpp +++ b/mozilla/accessible/src/base/nsRootAccessible.cpp @@ -87,8 +87,8 @@ NS_INTERFACE_MAP_BEGIN(nsRootAccessible) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsIDOMEventListener, nsIDOMFormListener) NS_INTERFACE_MAP_END_INHERITING(nsDocAccessible) -NS_IMPL_ADDREF_INHERITED(nsRootAccessible, nsDocAccessible); -NS_IMPL_RELEASE_INHERITED(nsRootAccessible, nsDocAccessible); +NS_IMPL_ADDREF_INHERITED(nsRootAccessible, nsDocAccessible) +NS_IMPL_RELEASE_INHERITED(nsRootAccessible, nsDocAccessible) //----------------------------------------------------- diff --git a/mozilla/browser/components/bookmarks/src/nsBookmarksService.cpp b/mozilla/browser/components/bookmarks/src/nsBookmarksService.cpp index bef15d4134f..302f29c6b0c 100644 --- a/mozilla/browser/components/bookmarks/src/nsBookmarksService.cpp +++ b/mozilla/browser/components/bookmarks/src/nsBookmarksService.cpp @@ -2490,7 +2490,7 @@ NS_IMETHODIMP nsBookmarksService::Observe(nsISupports *aSubject, const char *aTo //////////////////////////////////////////////////////////////////////// // nsISupports methods -NS_IMPL_ADDREF(nsBookmarksService); +NS_IMPL_ADDREF(nsBookmarksService) NS_IMETHODIMP_(nsrefcnt) nsBookmarksService::Release() diff --git a/mozilla/browser/components/build/nsModule.cpp b/mozilla/browser/components/build/nsModule.cpp index ca650b3a2ff..2a0e064c93c 100644 --- a/mozilla/browser/components/build/nsModule.cpp +++ b/mozilla/browser/components/build/nsModule.cpp @@ -68,4 +68,4 @@ static const nsModuleComponentInfo components[] = nsDownloadProxyConstructor } }; -NS_IMPL_NSGETMODULE(nsBrowserCompsModule, components); +NS_IMPL_NSGETMODULE(nsBrowserCompsModule, components) diff --git a/mozilla/calendar/libxpical/oeICalContainerImpl.cpp b/mozilla/calendar/libxpical/oeICalContainerImpl.cpp index ad3d26d5f15..10fb45c7e03 100644 --- a/mozilla/calendar/libxpical/oeICalContainerImpl.cpp +++ b/mozilla/calendar/libxpical/oeICalContainerImpl.cpp @@ -220,7 +220,7 @@ oeICalContainerImpl::~oeICalContainerImpl() * Notice that the second parameter to the macro is the static IID accessor * method, and NOT the #defined IID. */ -NS_IMPL_ISUPPORTS1(oeICalContainerImpl, oeIICalContainer); +NS_IMPL_ISUPPORTS1(oeICalContainerImpl, oeIICalContainer) NS_IMETHODIMP oeICalContainerImpl::AddCalendar( const char *server ) { diff --git a/mozilla/calendar/libxpical/oeICalFactory.cpp b/mozilla/calendar/libxpical/oeICalFactory.cpp index 9a546d968da..3d593588a90 100644 --- a/mozilla/calendar/libxpical/oeICalFactory.cpp +++ b/mozilla/calendar/libxpical/oeICalFactory.cpp @@ -44,12 +44,12 @@ -NS_GENERIC_FACTORY_CONSTRUCTOR(oeICalImpl); -NS_GENERIC_FACTORY_CONSTRUCTOR(oeICalContainerImpl); -NS_GENERIC_FACTORY_CONSTRUCTOR(oeICalEventImpl); -NS_GENERIC_FACTORY_CONSTRUCTOR(oeICalTodoImpl); -NS_GENERIC_FACTORY_CONSTRUCTOR(oeDateTimeImpl); -NS_GENERIC_FACTORY_CONSTRUCTOR(oeICalStartupHandler); +NS_GENERIC_FACTORY_CONSTRUCTOR(oeICalImpl) +NS_GENERIC_FACTORY_CONSTRUCTOR(oeICalContainerImpl) +NS_GENERIC_FACTORY_CONSTRUCTOR(oeICalEventImpl) +NS_GENERIC_FACTORY_CONSTRUCTOR(oeICalTodoImpl) +NS_GENERIC_FACTORY_CONSTRUCTOR(oeDateTimeImpl) +NS_GENERIC_FACTORY_CONSTRUCTOR(oeICalStartupHandler) static const nsModuleComponentInfo pModuleInfo[] = { diff --git a/mozilla/calendar/libxpical/oeICalImpl.cpp b/mozilla/calendar/libxpical/oeICalImpl.cpp index fab8895bb36..1fd95343160 100644 --- a/mozilla/calendar/libxpical/oeICalImpl.cpp +++ b/mozilla/calendar/libxpical/oeICalImpl.cpp @@ -300,7 +300,7 @@ oeICalImpl::~oeICalImpl() * Notice that the second parameter to the macro is the static IID accessor * method, and NOT the #defined IID. */ -NS_IMPL_ISUPPORTS1(oeICalImpl, oeIICal); +NS_IMPL_ISUPPORTS1(oeICalImpl, oeIICal) EventList *oeICalImpl::GetEventList() { diff --git a/mozilla/calendar/libxpical/oeICalStartupHandler.cpp b/mozilla/calendar/libxpical/oeICalStartupHandler.cpp index e890cef0fcf..6d7311b32f3 100644 --- a/mozilla/calendar/libxpical/oeICalStartupHandler.cpp +++ b/mozilla/calendar/libxpical/oeICalStartupHandler.cpp @@ -39,7 +39,7 @@ #include "nsString.h" #include "oeICalStartupHandler.h" -NS_IMPL_ISUPPORTS1(oeICalStartupHandler, nsICmdLineHandler); +NS_IMPL_ISUPPORTS1(oeICalStartupHandler, nsICmdLineHandler) oeICalStartupHandler::oeICalStartupHandler() { diff --git a/mozilla/caps/src/nsAggregatePrincipal.cpp b/mozilla/caps/src/nsAggregatePrincipal.cpp index 29dc43e36d1..a7a82d3392d 100644 --- a/mozilla/caps/src/nsAggregatePrincipal.cpp +++ b/mozilla/caps/src/nsAggregatePrincipal.cpp @@ -50,8 +50,8 @@ NS_IMPL_CI_INTERFACE_GETTER5(nsAggregatePrincipal, nsIAggregatePrincipal, nsICertificatePrincipal, nsICodebasePrincipal, nsIPrincipal, nsISerializable) -NSBASEPRINCIPALS_ADDREF(nsAggregatePrincipal); -NSBASEPRINCIPALS_RELEASE(nsAggregatePrincipal); +NSBASEPRINCIPALS_ADDREF(nsAggregatePrincipal) +NSBASEPRINCIPALS_RELEASE(nsAggregatePrincipal) ////////////////////////////////////////////////// // Methods implementing nsICertificatePrincipal // diff --git a/mozilla/caps/src/nsCertificatePrincipal.cpp b/mozilla/caps/src/nsCertificatePrincipal.cpp index b8fefcecf58..4db838cb229 100644 --- a/mozilla/caps/src/nsCertificatePrincipal.cpp +++ b/mozilla/caps/src/nsCertificatePrincipal.cpp @@ -55,8 +55,8 @@ NS_IMPL_CI_INTERFACE_GETTER3(nsCertificatePrincipal, nsIPrincipal, nsISerializable) -NSBASEPRINCIPALS_ADDREF(nsCertificatePrincipal); -NSBASEPRINCIPALS_RELEASE(nsCertificatePrincipal); +NSBASEPRINCIPALS_ADDREF(nsCertificatePrincipal) +NSBASEPRINCIPALS_RELEASE(nsCertificatePrincipal) ////////////////////////////////////////////////// // Methods implementing nsICertificatePrincipal // diff --git a/mozilla/caps/src/nsCodebasePrincipal.cpp b/mozilla/caps/src/nsCodebasePrincipal.cpp index 6ddac6a3394..4dac94b7dec 100644 --- a/mozilla/caps/src/nsCodebasePrincipal.cpp +++ b/mozilla/caps/src/nsCodebasePrincipal.cpp @@ -61,8 +61,8 @@ NS_IMPL_CI_INTERFACE_GETTER3(nsCodebasePrincipal, nsIPrincipal, nsISerializable) -NSBASEPRINCIPALS_ADDREF(nsCodebasePrincipal); -NSBASEPRINCIPALS_RELEASE(nsCodebasePrincipal); +NSBASEPRINCIPALS_ADDREF(nsCodebasePrincipal) +NSBASEPRINCIPALS_RELEASE(nsCodebasePrincipal) /////////////////////////////////////// // Methods implementing nsIPrincipal // diff --git a/mozilla/caps/src/nsSecurityManagerFactory.cpp b/mozilla/caps/src/nsSecurityManagerFactory.cpp index 2d4eb8c2023..f1fa7933863 100644 --- a/mozilla/caps/src/nsSecurityManagerFactory.cpp +++ b/mozilla/caps/src/nsSecurityManagerFactory.cpp @@ -463,5 +463,5 @@ CapsModuleDtor(nsIModule* thisModules) } NS_IMPL_NSGETMODULE_WITH_DTOR(nsSecurityManagerModule, capsComponentInfo, - CapsModuleDtor); + CapsModuleDtor) diff --git a/mozilla/caps/src/nsSystemPrincipal.cpp b/mozilla/caps/src/nsSystemPrincipal.cpp index c5095037fc8..e2f9b64b8eb 100644 --- a/mozilla/caps/src/nsSystemPrincipal.cpp +++ b/mozilla/caps/src/nsSystemPrincipal.cpp @@ -52,8 +52,8 @@ NS_IMPL_QUERY_INTERFACE2_CI(nsSystemPrincipal, nsIPrincipal, nsISerializable) NS_IMPL_CI_INTERFACE_GETTER2(nsSystemPrincipal, nsIPrincipal, nsISerializable) -NSBASEPRINCIPALS_ADDREF(nsSystemPrincipal); -NSBASEPRINCIPALS_RELEASE(nsSystemPrincipal); +NSBASEPRINCIPALS_ADDREF(nsSystemPrincipal) +NSBASEPRINCIPALS_RELEASE(nsSystemPrincipal) ///////////////////////////////////////