From 23af8f3c421459e228bf7b4080f48040ff526298 Mon Sep 17 00:00:00 2001 From: "bryner%brianryner.com" Date: Sun, 7 Sep 2003 22:24:21 +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@146618 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/gfx/src/beos/nsGfxFactoryBeOS.cpp | 2 +- mozilla/gfx/src/freetype/nsFreeType.cpp | 2 +- mozilla/gfx/src/gtk/nsGfxFactoryGTK.cpp | 2 +- mozilla/gfx/src/mac/nsDrawingSurfaceMac.cpp | 4 +- mozilla/gfx/src/mac/nsImageMac.cpp | 2 +- mozilla/gfx/src/mac/nsMacUnicodeFontInfo.cpp | 2 +- mozilla/gfx/src/nsBlender.cpp | 2 +- .../src/os2/nsDeviceContextSpecFactoryO.cpp | 2 +- mozilla/gfx/src/os2/nsFontMetricsOS2.cpp | 2 +- mozilla/gfx/src/os2/nsGfxFactoryOS2.cpp | 2 +- mozilla/gfx/src/windows/nsFontMetricsWin.cpp | 2 +- mozilla/gfx/src/windows/nsImageWin.cpp | 2 +- mozilla/gfx/src/xlib/nsGfxFactoryXlib.cpp | 2 +- mozilla/gfx/src/xlib/nsImageXlib.cpp | 2 +- mozilla/htmlparser/robot/nsRobotSink.cpp | 4 +- mozilla/htmlparser/src/nsElementTable.cpp | 2 +- mozilla/htmlparser/src/nsExpatDriver.cpp | 2 +- mozilla/intl/build/nsI18nModule.cpp | 4 +- .../src/classic/nsClassicCharDetDll.cpp | 10 +-- .../intl/chardet/src/nsCharDetConstructors.h | 46 +++++----- .../intl/chardet/src/nsCyrillicDetector.cpp | 4 +- .../intl/chardet/src/nsDetectionAdaptor.cpp | 4 +- .../chardet/src/nsDocumentCharsetInfo.cpp | 2 +- .../chardet/src/nsMetaCharsetObserver.cpp | 6 +- mozilla/intl/chardet/src/nsPSMDetectors.cpp | 4 +- .../chardet/src/nsXMLEncodingObserver.cpp | 6 +- mozilla/intl/ctl/src/nsCtlLEModule.cpp | 6 +- mozilla/intl/ctl/src/nsULE.cpp | 2 +- mozilla/intl/ctl/src/nsUnicodeToSunIndic.cpp | 4 +- mozilla/intl/ctl/src/nsUnicodeToTIS620.cpp | 4 +- .../intl/locale/src/mac/nsCollationMac.cpp | 2 +- .../intl/locale/src/mac/nsCollationMacUC.cpp | 2 +- .../locale/src/mac/nsDateTimeFormatMac.cpp | 2 +- mozilla/intl/locale/src/nsCollation.cpp | 2 +- .../intl/locale/src/nsFontPackageService.cpp | 2 +- mozilla/intl/locale/src/nsLocaleService.cpp | 2 +- .../intl/locale/src/unix/nsCollationUnix.cpp | 2 +- .../locale/src/unix/nsDateTimeFormatUnix.cpp | 2 +- .../locale/src/windows/nsCollationWin.cpp | 2 +- .../src/windows/nsDateTimeFormatWin.cpp | 2 +- .../intl/lwbrk/src/nsJISx4501LineBreaker.cpp | 2 +- mozilla/intl/lwbrk/src/nsLWBreakerFImp.cpp | 4 +- .../intl/lwbrk/src/nsSampleWordBreaker.cpp | 2 +- mozilla/intl/uconv/src/nsBeOSCharset.cpp | 2 +- mozilla/intl/uconv/src/nsCharsetAliasImp.cpp | 2 +- mozilla/intl/uconv/src/nsMacCharset.cpp | 2 +- mozilla/intl/uconv/src/nsUConvModule.cpp | 86 +++++++++---------- mozilla/intl/uconv/src/nsUNIXCharset.cpp | 2 +- .../intl/uconv/ucvko/nsUnicodeToJamoTTF.cpp | 2 +- .../intl/uconv/ucvko/nsUnicodeToX11Johab.cpp | 4 +- .../ucvlatin/nsUnicodeToLangBoxArabic16.cpp | 2 +- .../ucvlatin/nsUnicodeToLangBoxArabic8.cpp | 2 +- .../intl/uconv/ucvlatin/nsUnicodeToTSCII.cpp | 2 +- .../intl/uconv/ucvlatin/nsUnicodeToUTF32.cpp | 2 +- .../intl/uconv/ucvmath/nsUCvMathModule.cpp | 30 +++---- mozilla/intl/uconv/util/nsUCSupport.cpp | 10 +-- mozilla/intl/unicharutil/src/cattable.h | 2 +- .../unicharutil/src/nsCaseConversionImp2.cpp | 2 +- .../intl/unicharutil/src/nsCategoryImp.cpp | 2 +- .../unicharutil/src/nsUnicodeNormalizer.cpp | 2 +- mozilla/intl/unicharutil/tools/gencattable.pl | 2 +- .../parser/htmlparser/robot/nsRobotSink.cpp | 4 +- .../parser/htmlparser/src/nsElementTable.cpp | 2 +- .../parser/htmlparser/src/nsExpatDriver.cpp | 2 +- 64 files changed, 167 insertions(+), 167 deletions(-) diff --git a/mozilla/gfx/src/beos/nsGfxFactoryBeOS.cpp b/mozilla/gfx/src/beos/nsGfxFactoryBeOS.cpp index 8bfb3797014..9fb59c54ed7 100644 --- a/mozilla/gfx/src/beos/nsGfxFactoryBeOS.cpp +++ b/mozilla/gfx/src/beos/nsGfxFactoryBeOS.cpp @@ -68,7 +68,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsRegionBeOS) NS_GENERIC_FACTORY_CONSTRUCTOR(nsDeviceContextSpecBeOS) NS_GENERIC_FACTORY_CONSTRUCTOR(nsDeviceContextSpecFactoryBeOS) NS_GENERIC_FACTORY_CONSTRUCTOR(nsFontEnumeratorBeOS) -NS_GENERIC_FACTORY_CONSTRUCTOR(nsFontList); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsFontList) NS_GENERIC_FACTORY_CONSTRUCTOR(nsScreenManagerBeOS) NS_GENERIC_FACTORY_CONSTRUCTOR(nsPrinterEnumeratorBeOS) NS_GENERIC_FACTORY_CONSTRUCTOR(nsPrintOptionsBeOS) diff --git a/mozilla/gfx/src/freetype/nsFreeType.cpp b/mozilla/gfx/src/freetype/nsFreeType.cpp index 1455d1ee950..acae2935b9b 100644 --- a/mozilla/gfx/src/freetype/nsFreeType.cpp +++ b/mozilla/gfx/src/freetype/nsFreeType.cpp @@ -164,7 +164,7 @@ nsTTFontEncoderInfo FEI_windows_1252 = { // /////////////////////////////////////////////////////////////////////// -NS_IMPL_ISUPPORTS1(nsFreeType2, nsIFreeType2); +NS_IMPL_ISUPPORTS1(nsFreeType2, nsIFreeType2) // // Since the Freetype2 library may not be available on the user's diff --git a/mozilla/gfx/src/gtk/nsGfxFactoryGTK.cpp b/mozilla/gfx/src/gtk/nsGfxFactoryGTK.cpp index f3b45c24e3d..67d9210c014 100644 --- a/mozilla/gfx/src/gtk/nsGfxFactoryGTK.cpp +++ b/mozilla/gfx/src/gtk/nsGfxFactoryGTK.cpp @@ -83,7 +83,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsBlender) NS_GENERIC_FACTORY_CONSTRUCTOR(nsRegionGTK) NS_GENERIC_FACTORY_CONSTRUCTOR(nsDeviceContextSpecGTK) NS_GENERIC_FACTORY_CONSTRUCTOR(nsDeviceContextSpecFactoryGTK) -NS_GENERIC_FACTORY_CONSTRUCTOR(nsFontList); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsFontList) NS_GENERIC_FACTORY_CONSTRUCTOR(nsScreenManagerGtk) NS_GENERIC_FACTORY_CONSTRUCTOR(nsPrintOptionsGTK) NS_GENERIC_FACTORY_CONSTRUCTOR(nsPrinterEnumeratorGTK) diff --git a/mozilla/gfx/src/mac/nsDrawingSurfaceMac.cpp b/mozilla/gfx/src/mac/nsDrawingSurfaceMac.cpp index ff57240f1bd..ba59cb5e606 100644 --- a/mozilla/gfx/src/mac/nsDrawingSurfaceMac.cpp +++ b/mozilla/gfx/src/mac/nsDrawingSurfaceMac.cpp @@ -120,8 +120,8 @@ NS_IMETHODIMP nsDrawingSurfaceMac::QueryInterface(REFNSIID aIID, void** aInstanc return NS_NOINTERFACE; } -NS_IMPL_ADDREF(nsDrawingSurfaceMac); -NS_IMPL_RELEASE(nsDrawingSurfaceMac); +NS_IMPL_ADDREF(nsDrawingSurfaceMac) +NS_IMPL_RELEASE(nsDrawingSurfaceMac) #pragma mark- diff --git a/mozilla/gfx/src/mac/nsImageMac.cpp b/mozilla/gfx/src/mac/nsImageMac.cpp index fd0f3a9242a..a370a7536da 100644 --- a/mozilla/gfx/src/mac/nsImageMac.cpp +++ b/mozilla/gfx/src/mac/nsImageMac.cpp @@ -133,7 +133,7 @@ nsImageMac::~nsImageMac() } -NS_IMPL_ISUPPORTS2(nsImageMac, nsIImage, nsIImageMac); +NS_IMPL_ISUPPORTS2(nsImageMac, nsIImage, nsIImageMac) /** --------------------------------------------------- * See documentation in nsImageMac.h diff --git a/mozilla/gfx/src/mac/nsMacUnicodeFontInfo.cpp b/mozilla/gfx/src/mac/nsMacUnicodeFontInfo.cpp index a09201e9e80..12b264bace2 100644 --- a/mozilla/gfx/src/mac/nsMacUnicodeFontInfo.cpp +++ b/mozilla/gfx/src/mac/nsMacUnicodeFontInfo.cpp @@ -73,7 +73,7 @@ public: virtual ~nsFontCleanupObserver() {} }; -NS_IMPL_ISUPPORTS1(nsFontCleanupObserver, nsIObserver); +NS_IMPL_ISUPPORTS1(nsFontCleanupObserver, nsIObserver) NS_IMETHODIMP nsFontCleanupObserver::Observe(nsISupports *aSubject, const char *aTopic, const PRUnichar *someData) { diff --git a/mozilla/gfx/src/nsBlender.cpp b/mozilla/gfx/src/nsBlender.cpp index 55f9c1e3690..c5db954419c 100644 --- a/mozilla/gfx/src/nsBlender.cpp +++ b/mozilla/gfx/src/nsBlender.cpp @@ -57,7 +57,7 @@ nsBlender::~nsBlender() { } -NS_IMPL_ISUPPORTS1(nsBlender, nsIBlender); +NS_IMPL_ISUPPORTS1(nsBlender, nsIBlender) //------------------------------------------------------------ diff --git a/mozilla/gfx/src/os2/nsDeviceContextSpecFactoryO.cpp b/mozilla/gfx/src/os2/nsDeviceContextSpecFactoryO.cpp index 3086aa530ab..94e9b07cd62 100644 --- a/mozilla/gfx/src/os2/nsDeviceContextSpecFactoryO.cpp +++ b/mozilla/gfx/src/os2/nsDeviceContextSpecFactoryO.cpp @@ -50,7 +50,7 @@ nsDeviceContextSpecFactoryOS2 :: ~nsDeviceContextSpecFactoryOS2() { } -NS_IMPL_ISUPPORTS1(nsDeviceContextSpecFactoryOS2, nsIDeviceContextSpecFactory); +NS_IMPL_ISUPPORTS1(nsDeviceContextSpecFactoryOS2, nsIDeviceContextSpecFactory) NS_IMETHODIMP nsDeviceContextSpecFactoryOS2 :: Init(void) { diff --git a/mozilla/gfx/src/os2/nsFontMetricsOS2.cpp b/mozilla/gfx/src/os2/nsFontMetricsOS2.cpp index cc7eb6596ed..0d8124e3e36 100644 --- a/mozilla/gfx/src/os2/nsFontMetricsOS2.cpp +++ b/mozilla/gfx/src/os2/nsFontMetricsOS2.cpp @@ -289,7 +289,7 @@ public: virtual ~nsFontCleanupObserver() {} }; -NS_IMPL_ISUPPORTS1(nsFontCleanupObserver, nsIObserver); +NS_IMPL_ISUPPORTS1(nsFontCleanupObserver, nsIObserver) NS_IMETHODIMP nsFontCleanupObserver::Observe(nsISupports *aSubject, const char *aTopic, const PRUnichar *someData) { diff --git a/mozilla/gfx/src/os2/nsGfxFactoryOS2.cpp b/mozilla/gfx/src/os2/nsGfxFactoryOS2.cpp index 3be0514b572..0cdf61e24f1 100644 --- a/mozilla/gfx/src/os2/nsGfxFactoryOS2.cpp +++ b/mozilla/gfx/src/os2/nsGfxFactoryOS2.cpp @@ -71,7 +71,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsRegionOS2) NS_GENERIC_FACTORY_CONSTRUCTOR(nsDeviceContextSpecOS2) NS_GENERIC_FACTORY_CONSTRUCTOR(nsDeviceContextSpecFactoryOS2) NS_GENERIC_FACTORY_CONSTRUCTOR(nsFontEnumeratorOS2) -NS_GENERIC_FACTORY_CONSTRUCTOR(nsFontList); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsFontList) NS_GENERIC_FACTORY_CONSTRUCTOR(nsScreenManagerOS2) NS_GENERIC_FACTORY_CONSTRUCTOR(nsPrintOptionsOS2) NS_GENERIC_FACTORY_CONSTRUCTOR(nsPrinterEnumeratorOS2) diff --git a/mozilla/gfx/src/windows/nsFontMetricsWin.cpp b/mozilla/gfx/src/windows/nsFontMetricsWin.cpp index a35dd05debf..034aacefcd9 100644 --- a/mozilla/gfx/src/windows/nsFontMetricsWin.cpp +++ b/mozilla/gfx/src/windows/nsFontMetricsWin.cpp @@ -247,7 +247,7 @@ public: virtual ~nsFontCleanupObserver() {} }; -NS_IMPL_ISUPPORTS1(nsFontCleanupObserver, nsIObserver); +NS_IMPL_ISUPPORTS1(nsFontCleanupObserver, nsIObserver) NS_IMETHODIMP nsFontCleanupObserver::Observe(nsISupports *aSubject, const char *aTopic, const PRUnichar *someData) { diff --git a/mozilla/gfx/src/windows/nsImageWin.cpp b/mozilla/gfx/src/windows/nsImageWin.cpp index 03079e6aca8..d44fad6f2e9 100644 --- a/mozilla/gfx/src/windows/nsImageWin.cpp +++ b/mozilla/gfx/src/windows/nsImageWin.cpp @@ -108,7 +108,7 @@ nsImageWin :: ~nsImageWin() } -NS_IMPL_ISUPPORTS1(nsImageWin, nsIImage); +NS_IMPL_ISUPPORTS1(nsImageWin, nsIImage) /** --------------------------------------------------- diff --git a/mozilla/gfx/src/xlib/nsGfxFactoryXlib.cpp b/mozilla/gfx/src/xlib/nsGfxFactoryXlib.cpp index a24c895908b..d9a638af31d 100644 --- a/mozilla/gfx/src/xlib/nsGfxFactoryXlib.cpp +++ b/mozilla/gfx/src/xlib/nsGfxFactoryXlib.cpp @@ -71,7 +71,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsRegionXlib) NS_GENERIC_FACTORY_CONSTRUCTOR(nsDeviceContextSpecXlib) NS_GENERIC_FACTORY_CONSTRUCTOR(nsDeviceContextSpecFactoryXlib) NS_GENERIC_FACTORY_CONSTRUCTOR(nsFontEnumeratorXlib) -NS_GENERIC_FACTORY_CONSTRUCTOR(nsFontList); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsFontList) NS_GENERIC_FACTORY_CONSTRUCTOR(nsScreenManagerXlib) NS_GENERIC_FACTORY_CONSTRUCTOR(nsPrintOptionsXlib) NS_GENERIC_FACTORY_CONSTRUCTOR(nsPrinterEnumeratorXlib) diff --git a/mozilla/gfx/src/xlib/nsImageXlib.cpp b/mozilla/gfx/src/xlib/nsImageXlib.cpp index 5a9e0524d53..cc020e66033 100644 --- a/mozilla/gfx/src/xlib/nsImageXlib.cpp +++ b/mozilla/gfx/src/xlib/nsImageXlib.cpp @@ -154,7 +154,7 @@ nsImageXlib::~nsImageXlib() } -NS_IMPL_ISUPPORTS1(nsImageXlib, nsIImage); +NS_IMPL_ISUPPORTS1(nsImageXlib, nsIImage) nsresult nsImageXlib::Init(PRInt32 aWidth, PRInt32 aHeight, PRInt32 aDepth, nsMaskRequirements aMaskRequirements) diff --git a/mozilla/htmlparser/robot/nsRobotSink.cpp b/mozilla/htmlparser/robot/nsRobotSink.cpp index 6187438b63a..3ea7de14cb6 100644 --- a/mozilla/htmlparser/robot/nsRobotSink.cpp +++ b/mozilla/htmlparser/robot/nsRobotSink.cpp @@ -150,9 +150,9 @@ RobotSink::~RobotSink() } } -NS_IMPL_ADDREF(RobotSink); +NS_IMPL_ADDREF(RobotSink) -NS_IMPL_RELEASE(RobotSink); +NS_IMPL_RELEASE(RobotSink) NS_IMETHODIMP RobotSink::QueryInterface(REFNSIID aIID, void** aInstancePtr) { diff --git a/mozilla/htmlparser/src/nsElementTable.cpp b/mozilla/htmlparser/src/nsElementTable.cpp index f200ecd444d..0e0d8a7e6c2 100644 --- a/mozilla/htmlparser/src/nsElementTable.cpp +++ b/mozilla/htmlparser/src/nsElementTable.cpp @@ -1330,7 +1330,7 @@ void InitializeElementTable(void) { /*special props, prop-range*/ kNone, kBodyPropRange, /*special parents,kids,skip*/ &gInNoframes,&gBodyKids,eHTMLTag_unknown); }//if -}; +} void DeleteElementTable(void) { if(gHTMLElements) { diff --git a/mozilla/htmlparser/src/nsExpatDriver.cpp b/mozilla/htmlparser/src/nsExpatDriver.cpp index af4673fdac4..d3bb66f514a 100644 --- a/mozilla/htmlparser/src/nsExpatDriver.cpp +++ b/mozilla/htmlparser/src/nsExpatDriver.cpp @@ -306,7 +306,7 @@ IsLoadableDTD(const nsCatalogData* aCatalogData, nsCOMPtr* aDTD) NS_IMPL_ISUPPORTS2(nsExpatDriver, nsITokenizer, - nsIDTD); + nsIDTD) nsresult NS_NewExpatDriver(nsIDTD** aResult) { diff --git a/mozilla/intl/build/nsI18nModule.cpp b/mozilla/intl/build/nsI18nModule.cpp index ecda33632c9..31918f9a981 100644 --- a/mozilla/intl/build/nsI18nModule.cpp +++ b/mozilla/intl/build/nsI18nModule.cpp @@ -58,7 +58,7 @@ #include "nsLocaleConstructors.h" -NS_GENERIC_FACTORY_CONSTRUCTOR(nsSemanticUnitScanner); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsSemanticUnitScanner) static NS_METHOD AddCategoryEntry(const char* category, @@ -408,4 +408,4 @@ static nsModuleComponentInfo components[] = }; -NS_IMPL_NSGETMODULE(nsI18nModule, components); +NS_IMPL_NSGETMODULE(nsI18nModule, components) diff --git a/mozilla/intl/chardet/src/classic/nsClassicCharDetDll.cpp b/mozilla/intl/chardet/src/classic/nsClassicCharDetDll.cpp index 2b169c696e0..cbf0296c967 100644 --- a/mozilla/intl/chardet/src/classic/nsClassicCharDetDll.cpp +++ b/mozilla/intl/chardet/src/classic/nsClassicCharDetDll.cpp @@ -53,10 +53,10 @@ #include "nsClassicDetectors.h" -NS_GENERIC_FACTORY_CONSTRUCTOR(nsJACharsetClassicDetector); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsJAStringCharsetClassicDetector); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsKOCharsetClassicDetector); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsKOStringCharsetClassicDetector); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsJACharsetClassicDetector) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsJAStringCharsetClassicDetector) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsKOCharsetClassicDetector) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsKOStringCharsetClassicDetector) static const nsModuleComponentInfo components[] = { { "Classic JA Charset Detector", NS_JA_CLASSIC_DETECTOR_CID, @@ -69,5 +69,5 @@ static const nsModuleComponentInfo components[] = { NS_STRCDETECTOR_CONTRACTID_BASE "koclassic", nsKOStringCharsetClassicDetectorConstructor} }; -NS_IMPL_NSGETMODULE(nsCharDetModuleClassic, components); +NS_IMPL_NSGETMODULE(nsCharDetModuleClassic, components) diff --git a/mozilla/intl/chardet/src/nsCharDetConstructors.h b/mozilla/intl/chardet/src/nsCharDetConstructors.h index dcb78d7ead5..b90440b6054 100644 --- a/mozilla/intl/chardet/src/nsCharDetConstructors.h +++ b/mozilla/intl/chardet/src/nsCharDetConstructors.h @@ -63,31 +63,31 @@ #include "nsXMLEncodingCID.h" #include "nsCharsetDetectionAdaptorCID.h" -NS_GENERIC_FACTORY_CONSTRUCTOR(nsMetaCharsetObserver); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsDocumentCharsetInfo); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsXMLEncodingObserver); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsDetectionAdaptor); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsJAPSMDetector); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsJAStringPSMDetector); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsKOPSMDetector); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsKOStringPSMDetector); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsZHTWPSMDetector); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsZHTWStringPSMDetector); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsZHCNPSMDetector); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsZHCNStringPSMDetector); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsZHPSMDetector); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsZHStringPSMDetector); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsCJKPSMDetector); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsCJKStringPSMDetector); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsRUProbDetector); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsUKProbDetector); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsRUStringProbDetector); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsUKStringProbDetector); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsMetaCharsetObserver) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsDocumentCharsetInfo) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsXMLEncodingObserver) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsDetectionAdaptor) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsJAPSMDetector) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsJAStringPSMDetector) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsKOPSMDetector) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsKOStringPSMDetector) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsZHTWPSMDetector) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsZHTWStringPSMDetector) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsZHCNPSMDetector) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsZHCNStringPSMDetector) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsZHPSMDetector) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsZHStringPSMDetector) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsCJKPSMDetector) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsCJKStringPSMDetector) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsRUProbDetector) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUKProbDetector) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsRUStringProbDetector) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUKStringProbDetector) #ifdef INCLUDE_DBGDETECTOR -NS_GENERIC_FACTORY_CONSTRUCTOR(ns1stBlkDbgDetector); -NS_GENERIC_FACTORY_CONSTRUCTOR(ns2ndBlkDbgDetector); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsLastBlkDbgDetector); +NS_GENERIC_FACTORY_CONSTRUCTOR(ns1stBlkDbgDetector) +NS_GENERIC_FACTORY_CONSTRUCTOR(ns2ndBlkDbgDetector) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsLastBlkDbgDetector) #endif /* INCLUDE_DBGDETECTOR */ diff --git a/mozilla/intl/chardet/src/nsCyrillicDetector.cpp b/mozilla/intl/chardet/src/nsCyrillicDetector.cpp index e4108b4c2c1..7c4d5896165 100644 --- a/mozilla/intl/chardet/src/nsCyrillicDetector.cpp +++ b/mozilla/intl/chardet/src/nsCyrillicDetector.cpp @@ -48,8 +48,8 @@ //---------------------------------------------------------------------- // Interface nsISupports [implementation] -NS_IMPL_ISUPPORTS1(nsCyrXPCOMDetector, nsICharsetDetector); -NS_IMPL_ISUPPORTS1(nsCyrXPCOMStringDetector, nsIStringCharsetDetector); +NS_IMPL_ISUPPORTS1(nsCyrXPCOMDetector, nsICharsetDetector) +NS_IMPL_ISUPPORTS1(nsCyrXPCOMStringDetector, nsIStringCharsetDetector) void nsCyrillicDetector::HandleData(const char* aBuf, PRUint32 aLen) { diff --git a/mozilla/intl/chardet/src/nsDetectionAdaptor.cpp b/mozilla/intl/chardet/src/nsDetectionAdaptor.cpp index 51e23e5434c..8aca0e247c5 100644 --- a/mozilla/intl/chardet/src/nsDetectionAdaptor.cpp +++ b/mozilla/intl/chardet/src/nsDetectionAdaptor.cpp @@ -107,7 +107,7 @@ NS_IMETHODIMP nsMyObserver::Init( nsIWebShellServices* aWebShellSvc, return NS_ERROR_ILLEGAL_VALUE; } //-------------------------------------------------------------- -NS_IMPL_ISUPPORTS1 ( nsMyObserver ,nsICharsetDetectionObserver); +NS_IMPL_ISUPPORTS1 ( nsMyObserver ,nsICharsetDetectionObserver) //-------------------------------------------------------------- nsDetectionAdaptor::nsDetectionAdaptor( void ) @@ -120,7 +120,7 @@ nsDetectionAdaptor::~nsDetectionAdaptor() } //-------------------------------------------------------------- -NS_IMPL_ISUPPORTS2 (nsDetectionAdaptor, nsIParserFilter, nsICharsetDetectionAdaptor); +NS_IMPL_ISUPPORTS2 (nsDetectionAdaptor, nsIParserFilter, nsICharsetDetectionAdaptor) //-------------------------------------------------------------- NS_IMETHODIMP nsDetectionAdaptor::Init( diff --git a/mozilla/intl/chardet/src/nsDocumentCharsetInfo.cpp b/mozilla/intl/chardet/src/nsDocumentCharsetInfo.cpp index 31ba610f745..ed38aded7ca 100644 --- a/mozilla/intl/chardet/src/nsDocumentCharsetInfo.cpp +++ b/mozilla/intl/chardet/src/nsDocumentCharsetInfo.cpp @@ -44,7 +44,7 @@ // XXX doc me -NS_IMPL_THREADSAFE_ISUPPORTS1(nsDocumentCharsetInfo, nsIDocumentCharsetInfo); +NS_IMPL_THREADSAFE_ISUPPORTS1(nsDocumentCharsetInfo, nsIDocumentCharsetInfo) nsDocumentCharsetInfo::nsDocumentCharsetInfo() { diff --git a/mozilla/intl/chardet/src/nsMetaCharsetObserver.cpp b/mozilla/intl/chardet/src/nsMetaCharsetObserver.cpp index 11d752f0775..171215e270f 100644 --- a/mozilla/intl/chardet/src/nsMetaCharsetObserver.cpp +++ b/mozilla/intl/chardet/src/nsMetaCharsetObserver.cpp @@ -82,15 +82,15 @@ nsMetaCharsetObserver::~nsMetaCharsetObserver() } //------------------------------------------------------------------------- -NS_IMPL_ADDREF ( nsMetaCharsetObserver ); -NS_IMPL_RELEASE ( nsMetaCharsetObserver ); +NS_IMPL_ADDREF ( nsMetaCharsetObserver ) +NS_IMPL_RELEASE ( nsMetaCharsetObserver ) // Use the new scheme NS_IMPL_QUERY_INTERFACE4(nsMetaCharsetObserver, nsIElementObserver, nsIObserver, nsIMetaCharsetService, - nsISupportsWeakReference); + nsISupportsWeakReference) //------------------------------------------------------------------------- NS_IMETHODIMP nsMetaCharsetObserver::Notify( diff --git a/mozilla/intl/chardet/src/nsPSMDetectors.cpp b/mozilla/intl/chardet/src/nsPSMDetectors.cpp index 805eb84b9de..147c1cd7592 100644 --- a/mozilla/intl/chardet/src/nsPSMDetectors.cpp +++ b/mozilla/intl/chardet/src/nsPSMDetectors.cpp @@ -273,8 +273,8 @@ void nsEUCSampler::CalFreq() } //---------------------------------------------------------- -NS_IMPL_ISUPPORTS1(nsXPCOMDetector, nsICharsetDetector); -NS_IMPL_ISUPPORTS1(nsXPCOMStringDetector, nsIStringCharsetDetector); +NS_IMPL_ISUPPORTS1(nsXPCOMDetector, nsICharsetDetector) +NS_IMPL_ISUPPORTS1(nsXPCOMStringDetector, nsIStringCharsetDetector) nsPSMDetector::nsPSMDetector(PRUint8 aItems, nsVerifier* const * aVerifierSet, nsEUCStatistics* const * aStatisticsSet) { mClassRunSampler = (nsnull != aStatisticsSet); diff --git a/mozilla/intl/chardet/src/nsXMLEncodingObserver.cpp b/mozilla/intl/chardet/src/nsXMLEncodingObserver.cpp index 9bbeece46ff..ab2fab91039 100644 --- a/mozilla/intl/chardet/src/nsXMLEncodingObserver.cpp +++ b/mozilla/intl/chardet/src/nsXMLEncodingObserver.cpp @@ -75,15 +75,15 @@ nsXMLEncodingObserver::~nsXMLEncodingObserver() } //------------------------------------------------------------------------- -NS_IMPL_ADDREF ( nsXMLEncodingObserver ); -NS_IMPL_RELEASE ( nsXMLEncodingObserver ); +NS_IMPL_ADDREF ( nsXMLEncodingObserver ) +NS_IMPL_RELEASE ( nsXMLEncodingObserver ) // Use the new scheme NS_IMPL_QUERY_INTERFACE4(nsXMLEncodingObserver, nsIElementObserver, nsIObserver, nsIXMLEncodingService, - nsISupportsWeakReference); + nsISupportsWeakReference) //------------------------------------------------------------------------- NS_IMETHODIMP nsXMLEncodingObserver::Notify( diff --git a/mozilla/intl/ctl/src/nsCtlLEModule.cpp b/mozilla/intl/ctl/src/nsCtlLEModule.cpp index 73ac66abe6d..06ad412a813 100644 --- a/mozilla/intl/ctl/src/nsCtlLEModule.cpp +++ b/mozilla/intl/ctl/src/nsCtlLEModule.cpp @@ -56,9 +56,9 @@ NS_CONVERTER_REGISTRY_END NS_IMPL_NSUCONVERTERREGSELF -NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToTIS620); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToThaiTTF); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToSunIndic); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToTIS620) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToThaiTTF) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToSunIndic) static const nsModuleComponentInfo components[] = { diff --git a/mozilla/intl/ctl/src/nsULE.cpp b/mozilla/intl/ctl/src/nsULE.cpp index 1fcb35539b3..09493283abb 100644 --- a/mozilla/intl/ctl/src/nsULE.cpp +++ b/mozilla/intl/ctl/src/nsULE.cpp @@ -58,7 +58,7 @@ nsULE::~nsULE() { // No data to cleanup. } -NS_IMPL_ISUPPORTS1(nsULE, nsILE); +NS_IMPL_ISUPPORTS1(nsULE, nsILE) /* Caller needs to ensure that GetEngine is called with valid state */ PangoliteEngineShape* diff --git a/mozilla/intl/ctl/src/nsUnicodeToSunIndic.cpp b/mozilla/intl/ctl/src/nsUnicodeToSunIndic.cpp index d8424983481..c7813d96295 100644 --- a/mozilla/intl/ctl/src/nsUnicodeToSunIndic.cpp +++ b/mozilla/intl/ctl/src/nsUnicodeToSunIndic.cpp @@ -26,8 +26,8 @@ #include "nsULE.h" #include "nsUnicodeToSunIndic.h" -NS_IMPL_ADDREF(nsUnicodeToSunIndic); -NS_IMPL_RELEASE(nsUnicodeToSunIndic); +NS_IMPL_ADDREF(nsUnicodeToSunIndic) +NS_IMPL_RELEASE(nsUnicodeToSunIndic) PRInt32 nsUnicodeToSunIndic::Itemize(const PRUnichar* aSrcBuf, PRInt32 aSrcLen, textRunList *aRunList) diff --git a/mozilla/intl/ctl/src/nsUnicodeToTIS620.cpp b/mozilla/intl/ctl/src/nsUnicodeToTIS620.cpp index ad8ebce8db6..b7edbc330e2 100644 --- a/mozilla/intl/ctl/src/nsUnicodeToTIS620.cpp +++ b/mozilla/intl/ctl/src/nsUnicodeToTIS620.cpp @@ -36,8 +36,8 @@ static NS_DEFINE_CID(kCharSetManagerCID, NS_ICHARSETCONVERTERMANAGER_CID); // XPCOM stuff -NS_IMPL_ADDREF(nsUnicodeToTIS620); -NS_IMPL_RELEASE(nsUnicodeToTIS620); +NS_IMPL_ADDREF(nsUnicodeToTIS620) +NS_IMPL_RELEASE(nsUnicodeToTIS620) PRInt32 nsUnicodeToTIS620::Itemize(const PRUnichar* aSrcBuf, PRInt32 aSrcLen, textRunList *aRunList) diff --git a/mozilla/intl/locale/src/mac/nsCollationMac.cpp b/mozilla/intl/locale/src/mac/nsCollationMac.cpp index 32244e5786c..d9a0e519dcf 100644 --- a/mozilla/intl/locale/src/mac/nsCollationMac.cpp +++ b/mozilla/intl/locale/src/mac/nsCollationMac.cpp @@ -123,7 +123,7 @@ inline unsigned char mac_sort_tbl_search(const unsigned char ch, const unsigned //////////////////////////////////////////////////////////////////////////////// -NS_IMPL_ISUPPORTS1(nsCollationMac, nsICollation); +NS_IMPL_ISUPPORTS1(nsCollationMac, nsICollation) nsCollationMac::nsCollationMac() diff --git a/mozilla/intl/locale/src/mac/nsCollationMacUC.cpp b/mozilla/intl/locale/src/mac/nsCollationMacUC.cpp index d9eb1c5541b..5e4faec2b48 100644 --- a/mozilla/intl/locale/src/mac/nsCollationMacUC.cpp +++ b/mozilla/intl/locale/src/mac/nsCollationMacUC.cpp @@ -46,7 +46,7 @@ //////////////////////////////////////////////////////////////////////////////// -NS_IMPL_ISUPPORTS1(nsCollationMacUC, nsICollation); +NS_IMPL_ISUPPORTS1(nsCollationMacUC, nsICollation) nsCollationMacUC::nsCollationMacUC() diff --git a/mozilla/intl/locale/src/mac/nsDateTimeFormatMac.cpp b/mozilla/intl/locale/src/mac/nsDateTimeFormatMac.cpp index bb348886c7f..2930ba0513b 100644 --- a/mozilla/intl/locale/src/mac/nsDateTimeFormatMac.cpp +++ b/mozilla/intl/locale/src/mac/nsDateTimeFormatMac.cpp @@ -231,7 +231,7 @@ static void AbbrevWeekdayString(DateTimeRec &dateTime, Str255 weekdayString, Int //////////////////////////////////////////////////////////////////////////////// -NS_IMPL_THREADSAFE_ISUPPORTS1(nsDateTimeFormatMac, nsIDateTimeFormat); +NS_IMPL_THREADSAFE_ISUPPORTS1(nsDateTimeFormatMac, nsIDateTimeFormat) nsresult nsDateTimeFormatMac::Initialize(nsILocale* locale) { diff --git a/mozilla/intl/locale/src/nsCollation.cpp b/mozilla/intl/locale/src/nsCollation.cpp index 9316d19f12e..1ede45c39b7 100644 --- a/mozilla/intl/locale/src/nsCollation.cpp +++ b/mozilla/intl/locale/src/nsCollation.cpp @@ -50,7 +50,7 @@ NS_DEFINE_CID(kCollationCID, NS_COLLATION_CID); -NS_IMPL_ISUPPORTS1(nsCollationFactory, nsICollationFactory); +NS_IMPL_ISUPPORTS1(nsCollationFactory, nsICollationFactory) nsresult nsCollationFactory::CreateCollation(nsILocale* locale, nsICollation** instancePtr) { diff --git a/mozilla/intl/locale/src/nsFontPackageService.cpp b/mozilla/intl/locale/src/nsFontPackageService.cpp index e9961066987..181b5a26e66 100644 --- a/mozilla/intl/locale/src/nsFontPackageService.cpp +++ b/mozilla/intl/locale/src/nsFontPackageService.cpp @@ -60,7 +60,7 @@ static PRInt8 mZHCNState = eInit; NS_IMPL_THREADSAFE_ISUPPORTS2(nsFontPackageService, nsIFontPackageService, - nsIFontPackageProxy); + nsIFontPackageProxy) /* from nsIFontPackageSercice.h */ nsFontPackageService::nsFontPackageService() : mHandler(nsnull) diff --git a/mozilla/intl/locale/src/nsLocaleService.cpp b/mozilla/intl/locale/src/nsLocaleService.cpp index 2f46b5d002c..56694d5b241 100644 --- a/mozilla/intl/locale/src/nsLocaleService.cpp +++ b/mozilla/intl/locale/src/nsLocaleService.cpp @@ -325,7 +325,7 @@ nsLocaleService::~nsLocaleService(void) if (mApplicationLocale) mApplicationLocale->Release(); } -NS_IMPL_THREADSAFE_ISUPPORTS1(nsLocaleService, nsILocaleService); +NS_IMPL_THREADSAFE_ISUPPORTS1(nsLocaleService, nsILocaleService) NS_IMETHODIMP nsLocaleService::NewLocale(const PRUnichar *aLocale, nsILocale **_retval) diff --git a/mozilla/intl/locale/src/unix/nsCollationUnix.cpp b/mozilla/intl/locale/src/unix/nsCollationUnix.cpp index b45b91ef4e5..c975d6be3d6 100644 --- a/mozilla/intl/locale/src/unix/nsCollationUnix.cpp +++ b/mozilla/intl/locale/src/unix/nsCollationUnix.cpp @@ -167,7 +167,7 @@ nsresult nsCollationUnix::Initialize(nsILocale* locale) } return NS_OK; -}; +} nsresult nsCollationUnix::CompareString(const nsCollationStrength strength, diff --git a/mozilla/intl/locale/src/unix/nsDateTimeFormatUnix.cpp b/mozilla/intl/locale/src/unix/nsDateTimeFormatUnix.cpp index b25b9d5ea63..2c98fe11ec0 100644 --- a/mozilla/intl/locale/src/unix/nsDateTimeFormatUnix.cpp +++ b/mozilla/intl/locale/src/unix/nsDateTimeFormatUnix.cpp @@ -50,7 +50,7 @@ #include "nsReadableUtils.h" #include "nsUnicharUtils.h" -NS_IMPL_THREADSAFE_ISUPPORTS1(nsDateTimeFormatUnix, nsIDateTimeFormat); +NS_IMPL_THREADSAFE_ISUPPORTS1(nsDateTimeFormatUnix, nsIDateTimeFormat) // init this interface to a specified locale nsresult nsDateTimeFormatUnix::Initialize(nsILocale* locale) diff --git a/mozilla/intl/locale/src/windows/nsCollationWin.cpp b/mozilla/intl/locale/src/windows/nsCollationWin.cpp index a79d236da46..ffcaecf118c 100644 --- a/mozilla/intl/locale/src/windows/nsCollationWin.cpp +++ b/mozilla/intl/locale/src/windows/nsCollationWin.cpp @@ -51,7 +51,7 @@ #include #undef CompareString -NS_IMPL_ISUPPORTS1(nsCollationWin, nsICollation); +NS_IMPL_ISUPPORTS1(nsCollationWin, nsICollation) nsCollationWin::nsCollationWin() diff --git a/mozilla/intl/locale/src/windows/nsDateTimeFormatWin.cpp b/mozilla/intl/locale/src/windows/nsDateTimeFormatWin.cpp index 398ba52d131..2936fb8da9d 100644 --- a/mozilla/intl/locale/src/windows/nsDateTimeFormatWin.cpp +++ b/mozilla/intl/locale/src/windows/nsDateTimeFormatWin.cpp @@ -51,7 +51,7 @@ #define NSDATETIMEFORMAT_BUFFER_LEN 80 -NS_IMPL_THREADSAFE_ISUPPORTS1(nsDateTimeFormatWin, nsIDateTimeFormat); +NS_IMPL_THREADSAFE_ISUPPORTS1(nsDateTimeFormatWin, nsIDateTimeFormat) // init this interface to a specified locale diff --git a/mozilla/intl/lwbrk/src/nsJISx4501LineBreaker.cpp b/mozilla/intl/lwbrk/src/nsJISx4501LineBreaker.cpp index 2bc2f501793..b1f27692781 100644 --- a/mozilla/intl/lwbrk/src/nsJISx4501LineBreaker.cpp +++ b/mozilla/intl/lwbrk/src/nsJISx4501LineBreaker.cpp @@ -336,7 +336,7 @@ nsJISx4501LineBreaker::~nsJISx4501LineBreaker() { } -NS_IMPL_ISUPPORTS1(nsJISx4501LineBreaker, nsILineBreaker); +NS_IMPL_ISUPPORTS1(nsJISx4501LineBreaker, nsILineBreaker) #define U_PERIOD ((PRUnichar) '.') #define U_COMMA ((PRUnichar) ',') diff --git a/mozilla/intl/lwbrk/src/nsLWBreakerFImp.cpp b/mozilla/intl/lwbrk/src/nsLWBreakerFImp.cpp index 7dcfc77d7f4..0c383414da5 100644 --- a/mozilla/intl/lwbrk/src/nsLWBreakerFImp.cpp +++ b/mozilla/intl/lwbrk/src/nsLWBreakerFImp.cpp @@ -55,8 +55,8 @@ NS_DEFINE_IID(kIWordBreakerFactoryIID, NS_IWORDBREAKERFACTORY_IID); NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); -NS_IMPL_ADDREF ( nsLWBreakerFImp ); -NS_IMPL_RELEASE ( nsLWBreakerFImp ); +NS_IMPL_ADDREF ( nsLWBreakerFImp ) +NS_IMPL_RELEASE ( nsLWBreakerFImp ) nsresult nsLWBreakerFImp::QueryInterface(REFNSIID aIID, void** aInstancePtr) diff --git a/mozilla/intl/lwbrk/src/nsSampleWordBreaker.cpp b/mozilla/intl/lwbrk/src/nsSampleWordBreaker.cpp index b336d6ab6c5..e206e0bcc3e 100644 --- a/mozilla/intl/lwbrk/src/nsSampleWordBreaker.cpp +++ b/mozilla/intl/lwbrk/src/nsSampleWordBreaker.cpp @@ -48,7 +48,7 @@ nsSampleWordBreaker::~nsSampleWordBreaker() { } -NS_IMPL_ISUPPORTS1(nsSampleWordBreaker, nsIWordBreaker); +NS_IMPL_ISUPPORTS1(nsSampleWordBreaker, nsIWordBreaker) nsresult nsSampleWordBreaker::BreakInBetween( const PRUnichar* aText1 , PRUint32 aTextLen1, diff --git a/mozilla/intl/uconv/src/nsBeOSCharset.cpp b/mozilla/intl/uconv/src/nsBeOSCharset.cpp index 4a5776c376a..f417c87adda 100644 --- a/mozilla/intl/uconv/src/nsBeOSCharset.cpp +++ b/mozilla/intl/uconv/src/nsBeOSCharset.cpp @@ -40,7 +40,7 @@ // are still running in their own thread, and reference counting takes place within // that thread, we need to reference and de-reference outselves atomically. // See BugZilla Bug# 92793 -NS_IMPL_THREADSAFE_ISUPPORTS1(nsPlatformCharset, nsIPlatformCharset); +NS_IMPL_THREADSAFE_ISUPPORTS1(nsPlatformCharset, nsIPlatformCharset) nsPlatformCharset::nsPlatformCharset() { diff --git a/mozilla/intl/uconv/src/nsCharsetAliasImp.cpp b/mozilla/intl/uconv/src/nsCharsetAliasImp.cpp index 9bd469a6c55..1b4f300a1dd 100644 --- a/mozilla/intl/uconv/src/nsCharsetAliasImp.cpp +++ b/mozilla/intl/uconv/src/nsCharsetAliasImp.cpp @@ -51,7 +51,7 @@ #include "nsCharsetAlias.h" //-------------------------------------------------------------- -NS_IMPL_ISUPPORTS1(nsCharsetAlias2, nsICharsetAlias); +NS_IMPL_ISUPPORTS1(nsCharsetAlias2, nsICharsetAlias) //-------------------------------------------------------------- nsCharsetAlias2::nsCharsetAlias2() diff --git a/mozilla/intl/uconv/src/nsMacCharset.cpp b/mozilla/intl/uconv/src/nsMacCharset.cpp index e8ac92a3cf5..729456878bd 100644 --- a/mozilla/intl/uconv/src/nsMacCharset.cpp +++ b/mozilla/intl/uconv/src/nsMacCharset.cpp @@ -53,7 +53,7 @@ static nsURLProperties *gInfo = nsnull; static PRInt32 gCnt = 0; -NS_IMPL_ISUPPORTS1(nsPlatformCharset, nsIPlatformCharset); +NS_IMPL_ISUPPORTS1(nsPlatformCharset, nsIPlatformCharset) nsPlatformCharset::nsPlatformCharset() { diff --git a/mozilla/intl/uconv/src/nsUConvModule.cpp b/mozilla/intl/uconv/src/nsUConvModule.cpp index fe0d11829e6..364861206f2 100644 --- a/mozilla/intl/uconv/src/nsUConvModule.cpp +++ b/mozilla/intl/uconv/src/nsUConvModule.cpp @@ -477,72 +477,72 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToUTF8) NS_GENERIC_FACTORY_CONSTRUCTOR(nsUTF8ToUnicode) // ucvlatin -NS_GENERIC_FACTORY_CONSTRUCTOR(nsUTF7ToUnicode); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsMUTF7ToUnicode); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsUTF16BEToUnicode); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsUTF16LEToUnicode); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsUTF32BEToUnicode); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsUTF32LEToUnicode); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToUEscape); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsUEscapeToUnicode); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToUTF7); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToMUTF7); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToUTF16BE); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToUTF16LE); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToUTF16); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToUTF32BE); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToUTF32LE); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToTSCII); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToTamilTTF); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUTF7ToUnicode) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsMUTF7ToUnicode) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUTF16BEToUnicode) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUTF16LEToUnicode) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUTF32BEToUnicode) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUTF32LEToUnicode) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToUEscape) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUEscapeToUnicode) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToUTF7) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToMUTF7) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToUTF16BE) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToUTF16LE) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToUTF16) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToUTF32BE) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToUTF32LE) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToTSCII) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToTamilTTF) #ifdef MOZ_EXTRA_X11CONVERTERS -NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToLangBoxArabic8); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToLangBoxArabic16); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToLangBoxArabic8) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToLangBoxArabic16) #endif // MOZ_EXTRA_X11CONVERTERS // ucvibm // ucvja -NS_GENERIC_FACTORY_CONSTRUCTOR(nsShiftJISToUnicode); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsEUCJPToUnicodeV2); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsISO2022JPToUnicodeV2); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToISO2022JP); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsShiftJISToUnicode) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsEUCJPToUnicodeV2) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsISO2022JPToUnicodeV2) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToISO2022JP) // ucvtw2 // ucvtw #ifdef MOZ_EXTRA_X11CONVERTERS -NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToBIG5NoAscii); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToBIG5NoAscii) #endif // ucvko #ifdef MOZ_EXTRA_X11CONVERTERS -NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToX11Johab); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToX11Johab) #endif -NS_GENERIC_FACTORY_CONSTRUCTOR(nsISO2022KRToUnicode); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToJamoTTF); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsISO2022KRToUnicode) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToJamoTTF) // ucvcn -NS_GENERIC_FACTORY_CONSTRUCTOR(nsGB2312ToUnicodeV2); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToGB2312V2); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsCP936ToUnicode); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToCP936); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsGBKToUnicode); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToGBK); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsGB2312ToUnicodeV2) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToGB2312V2) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsCP936ToUnicode) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToCP936) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsGBKToUnicode) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToGBK) #ifdef MOZ_EXTRA_X11CONVERTERS -NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToGBKNoAscii); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToGBKNoAscii) #endif -NS_GENERIC_FACTORY_CONSTRUCTOR(nsHZToUnicode); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToHZ); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsHZToUnicode) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToHZ) #ifdef MOZ_EXTRA_X11CONVERTERS -NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToGB2312GL); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToGB2312GL) #endif -NS_GENERIC_FACTORY_CONSTRUCTOR(nsGB18030ToUnicode); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToGB18030); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsGB18030ToUnicode) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToGB18030) #ifdef MOZ_EXTRA_X11CONVERTERS -NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToGB18030Font0); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToGB18030Font1); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToGB18030Font0) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToGB18030Font1) #endif -NS_GENERIC_FACTORY_CONSTRUCTOR(nsISO2022CNToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsISO2022CNToUnicode) //---------------------------------------------------------------------------- @@ -1799,5 +1799,5 @@ static const nsModuleComponentInfo components[] = #endif // MOZ_USE_NATIVE_UCONV }; -NS_IMPL_NSGETMODULE(nsUConvModule, components); +NS_IMPL_NSGETMODULE(nsUConvModule, components) diff --git a/mozilla/intl/uconv/src/nsUNIXCharset.cpp b/mozilla/intl/uconv/src/nsUNIXCharset.cpp index b87a49d8126..60d57c41988 100644 --- a/mozilla/intl/uconv/src/nsUNIXCharset.cpp +++ b/mozilla/intl/uconv/src/nsUNIXCharset.cpp @@ -63,7 +63,7 @@ #include "nsAutoLock.h" #include "prinit.h" -NS_IMPL_THREADSAFE_ISUPPORTS1(nsPlatformCharset, nsIPlatformCharset); +NS_IMPL_THREADSAFE_ISUPPORTS1(nsPlatformCharset, nsIPlatformCharset) static nsURLProperties *gNLInfo = nsnull; static nsURLProperties *gInfo_deprecated = nsnull; diff --git a/mozilla/intl/uconv/ucvko/nsUnicodeToJamoTTF.cpp b/mozilla/intl/uconv/ucvko/nsUnicodeToJamoTTF.cpp index 728b89e5ae1..3dee1eea994 100644 --- a/mozilla/intl/uconv/ucvko/nsUnicodeToJamoTTF.cpp +++ b/mozilla/intl/uconv/ucvko/nsUnicodeToJamoTTF.cpp @@ -159,7 +159,7 @@ static nsresult ScanDecomposeSyllable (PRUnichar *aIn, PRInt32* aLength, //---------------------------------------------------------------------- // Class nsUnicodeToJamoTTF [implementation] -NS_IMPL_ISUPPORTS2(nsUnicodeToJamoTTF, nsIUnicodeEncoder, nsICharRepresentable); +NS_IMPL_ISUPPORTS2(nsUnicodeToJamoTTF, nsIUnicodeEncoder, nsICharRepresentable) NS_IMETHODIMP nsUnicodeToJamoTTF::SetOutputErrorBehavior(PRInt32 aBehavior, diff --git a/mozilla/intl/uconv/ucvko/nsUnicodeToX11Johab.cpp b/mozilla/intl/uconv/ucvko/nsUnicodeToX11Johab.cpp index eb40ce93bed..8ed88a0a36e 100644 --- a/mozilla/intl/uconv/ucvko/nsUnicodeToX11Johab.cpp +++ b/mozilla/intl/uconv/ucvko/nsUnicodeToX11Johab.cpp @@ -56,8 +56,8 @@ typedef char byte; // XPCOM stuff -NS_IMPL_ADDREF(nsUnicodeToX11Johab); -NS_IMPL_RELEASE(nsUnicodeToX11Johab); +NS_IMPL_ADDREF(nsUnicodeToX11Johab) +NS_IMPL_RELEASE(nsUnicodeToX11Johab) nsresult nsUnicodeToX11Johab::QueryInterface(REFNSIID aIID, void** aInstancePtr) { diff --git a/mozilla/intl/uconv/ucvlatin/nsUnicodeToLangBoxArabic16.cpp b/mozilla/intl/uconv/ucvlatin/nsUnicodeToLangBoxArabic16.cpp index afa143d2ab6..694281f5cc6 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUnicodeToLangBoxArabic16.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsUnicodeToLangBoxArabic16.cpp @@ -262,7 +262,7 @@ const PRUnichar * aSrc, PRInt32 aSrcLength, { *aDestLength = aSrcLength; return NS_OK; -}; +} NS_IMETHODIMP nsUnicodeToLangBoxArabic16::Finish( char * aDest, PRInt32 * aDestLength) diff --git a/mozilla/intl/uconv/ucvlatin/nsUnicodeToLangBoxArabic8.cpp b/mozilla/intl/uconv/ucvlatin/nsUnicodeToLangBoxArabic8.cpp index 6ff566fbeeb..bc933ea60f1 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUnicodeToLangBoxArabic8.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsUnicodeToLangBoxArabic8.cpp @@ -248,7 +248,7 @@ const PRUnichar * aSrc, PRInt32 aSrcLength, { *aDestLength = 2*aSrcLength; return NS_OK; -}; +} NS_IMETHODIMP nsUnicodeToLangBoxArabic8::Finish( char * aDest, PRInt32 * aDestLength) diff --git a/mozilla/intl/uconv/ucvlatin/nsUnicodeToTSCII.cpp b/mozilla/intl/uconv/ucvlatin/nsUnicodeToTSCII.cpp index 07aefaad18a..62f5531b7d4 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUnicodeToTSCII.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsUnicodeToTSCII.cpp @@ -56,7 +56,7 @@ //---------------------------------------------------------------------- // Class nsUnicodeToTSCII [implementation] -NS_IMPL_ISUPPORTS2(nsUnicodeToTSCII, nsIUnicodeEncoder, nsICharRepresentable); +NS_IMPL_ISUPPORTS2(nsUnicodeToTSCII, nsIUnicodeEncoder, nsICharRepresentable) /* * During UCS-4 to TSCII conversion, mState contains diff --git a/mozilla/intl/uconv/ucvlatin/nsUnicodeToUTF32.cpp b/mozilla/intl/uconv/ucvlatin/nsUnicodeToUTF32.cpp index b058cc0a579..e90c568da55 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUnicodeToUTF32.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsUnicodeToUTF32.cpp @@ -194,7 +194,7 @@ static nsresult FinishCommon(char * aDest, //---------------------------------------------------------------------- // Class nsUnicodeToUTF32 [implementation] -NS_IMPL_ISUPPORTS1(nsUnicodeToUTF32, nsIUnicodeEncoder); +NS_IMPL_ISUPPORTS1(nsUnicodeToUTF32, nsIUnicodeEncoder) //---------------------------------------------------------------------- diff --git a/mozilla/intl/uconv/ucvmath/nsUCvMathModule.cpp b/mozilla/intl/uconv/ucvmath/nsUCvMathModule.cpp index a7bd41ac6ad..90bb5b2d0a2 100644 --- a/mozilla/intl/uconv/ucvmath/nsUCvMathModule.cpp +++ b/mozilla/intl/uconv/ucvmath/nsUCvMathModule.cpp @@ -98,22 +98,22 @@ NS_CONVERTER_REGISTRY_END NS_IMPL_NSUCONVERTERREGSELF -NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToTeXCMRttf); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToTeXCMMIttf); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToTeXCMSYttf); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToTeXCMEXttf); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToTeXCMRttf) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToTeXCMMIttf) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToTeXCMSYttf) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToTeXCMEXttf) #if !defined(XP_WIN) && !defined(XP_OS2) && !defined(XP_MAC) && !defined(XP_MACOSX) -NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToTeXCMRt1); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToTeXCMMIt1); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToTeXCMSYt1); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToTeXCMEXt1); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToTeXCMRt1) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToTeXCMMIt1) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToTeXCMSYt1) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToTeXCMEXt1) #endif -NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToMathematica1); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToMathematica2); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToMathematica3); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToMathematica4); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToMathematica5); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToMTExtra); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToMathematica1) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToMathematica2) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToMathematica3) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToMathematica4) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToMathematica5) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToMTExtra) static const nsModuleComponentInfo components[] = { @@ -192,5 +192,5 @@ static const nsModuleComponentInfo components[] = } }; -NS_IMPL_NSGETMODULE(nsUCvMathModule, components); +NS_IMPL_NSGETMODULE(nsUCvMathModule, components) diff --git a/mozilla/intl/uconv/util/nsUCSupport.cpp b/mozilla/intl/uconv/util/nsUCSupport.cpp index 71819b813f6..6f3337f4ecc 100644 --- a/mozilla/intl/uconv/util/nsUCSupport.cpp +++ b/mozilla/intl/uconv/util/nsUCSupport.cpp @@ -63,10 +63,10 @@ nsBasicDecoderSupport::~nsBasicDecoderSupport() //---------------------------------------------------------------------- // Interface nsISupports [implementation] -NS_IMPL_ADDREF(nsBasicDecoderSupport); -NS_IMPL_RELEASE(nsBasicDecoderSupport); +NS_IMPL_ADDREF(nsBasicDecoderSupport) +NS_IMPL_RELEASE(nsBasicDecoderSupport) #ifdef NS_DEBUG -NS_IMPL_QUERY_INTERFACE2(nsBasicDecoderSupport, nsIUnicodeDecoder, nsIBasicDecoder); +NS_IMPL_QUERY_INTERFACE2(nsBasicDecoderSupport, nsIUnicodeDecoder, nsIBasicDecoder) #else NS_IMPL_QUERY_INTERFACE1(nsBasicDecoderSupport, nsIUnicodeDecoder) #endif @@ -366,8 +366,8 @@ nsBasicEncoder::~nsBasicEncoder() //---------------------------------------------------------------------- // Interface nsISupports [implementation] -NS_IMPL_ADDREF(nsBasicEncoder); -NS_IMPL_RELEASE(nsBasicEncoder); +NS_IMPL_ADDREF(nsBasicEncoder) +NS_IMPL_RELEASE(nsBasicEncoder) #ifdef NS_DEBUG NS_IMPL_QUERY_INTERFACE3(nsBasicEncoder, nsIUnicodeEncoder, diff --git a/mozilla/intl/unicharutil/src/cattable.h b/mozilla/intl/unicharutil/src/cattable.h index 4d6756ac82d..11873bc60a7 100644 --- a/mozilla/intl/unicharutil/src/cattable.h +++ b/mozilla/intl/unicharutil/src/cattable.h @@ -1508,5 +1508,5 @@ static PRUint8 GetCat(PRUnichar u) return 4; return 0; // UNDEFINE -}; +} // total data size = 1988 diff --git a/mozilla/intl/unicharutil/src/nsCaseConversionImp2.cpp b/mozilla/intl/unicharutil/src/nsCaseConversionImp2.cpp index 8c1e583871f..45b70b877cf 100644 --- a/mozilla/intl/unicharutil/src/nsCaseConversionImp2.cpp +++ b/mozilla/intl/unicharutil/src/nsCaseConversionImp2.cpp @@ -176,7 +176,7 @@ PRUnichar nsCompressedMap::Lookup( nsrefcnt nsCaseConversionImp2::gInit = 0; -NS_IMPL_ISUPPORTS1(nsCaseConversionImp2, nsICaseConversion); +NS_IMPL_ISUPPORTS1(nsCaseConversionImp2, nsICaseConversion) static nsCompressedMap *gUpperMap = nsnull; static nsCompressedMap *gLowerMap = nsnull; diff --git a/mozilla/intl/unicharutil/src/nsCategoryImp.cpp b/mozilla/intl/unicharutil/src/nsCategoryImp.cpp index 9a992832148..7a44639fec9 100644 --- a/mozilla/intl/unicharutil/src/nsCategoryImp.cpp +++ b/mozilla/intl/unicharutil/src/nsCategoryImp.cpp @@ -43,7 +43,7 @@ #include "nsCategoryImp.h" #include "cattable.h" -NS_IMPL_ISUPPORTS1(nsCategoryImp, nsIUGenCategory); +NS_IMPL_ISUPPORTS1(nsCategoryImp, nsIUGenCategory) nsCategoryImp::nsCategoryImp() diff --git a/mozilla/intl/unicharutil/src/nsUnicodeNormalizer.cpp b/mozilla/intl/unicharutil/src/nsUnicodeNormalizer.cpp index 1ce8ff38720..252c64bf685 100644 --- a/mozilla/intl/unicharutil/src/nsUnicodeNormalizer.cpp +++ b/mozilla/intl/unicharutil/src/nsUnicodeNormalizer.cpp @@ -93,7 +93,7 @@ #include "nsString.h" #include "nsReadableUtils.h" -NS_IMPL_ISUPPORTS1(nsUnicodeNormalizer, nsIUnicodeNormalizer); +NS_IMPL_ISUPPORTS1(nsUnicodeNormalizer, nsIUnicodeNormalizer) nsUnicodeNormalizer::nsUnicodeNormalizer() diff --git a/mozilla/intl/unicharutil/tools/gencattable.pl b/mozilla/intl/unicharutil/tools/gencattable.pl index b573b4b1bae..1a037994048 100644 --- a/mozilla/intl/unicharutil/tools/gencattable.pl +++ b/mozilla/intl/unicharutil/tools/gencattable.pl @@ -276,7 +276,7 @@ foreach $s ( sort(@special) ) { -printf OUT " return 0; // UNDEFINE \n};\n"; +printf OUT " return 0; // UNDEFINE \n}\n"; printf OUT "// total data size = $totaldata\n"; #$total = 0; diff --git a/mozilla/parser/htmlparser/robot/nsRobotSink.cpp b/mozilla/parser/htmlparser/robot/nsRobotSink.cpp index 6187438b63a..3ea7de14cb6 100644 --- a/mozilla/parser/htmlparser/robot/nsRobotSink.cpp +++ b/mozilla/parser/htmlparser/robot/nsRobotSink.cpp @@ -150,9 +150,9 @@ RobotSink::~RobotSink() } } -NS_IMPL_ADDREF(RobotSink); +NS_IMPL_ADDREF(RobotSink) -NS_IMPL_RELEASE(RobotSink); +NS_IMPL_RELEASE(RobotSink) NS_IMETHODIMP RobotSink::QueryInterface(REFNSIID aIID, void** aInstancePtr) { diff --git a/mozilla/parser/htmlparser/src/nsElementTable.cpp b/mozilla/parser/htmlparser/src/nsElementTable.cpp index f200ecd444d..0e0d8a7e6c2 100644 --- a/mozilla/parser/htmlparser/src/nsElementTable.cpp +++ b/mozilla/parser/htmlparser/src/nsElementTable.cpp @@ -1330,7 +1330,7 @@ void InitializeElementTable(void) { /*special props, prop-range*/ kNone, kBodyPropRange, /*special parents,kids,skip*/ &gInNoframes,&gBodyKids,eHTMLTag_unknown); }//if -}; +} void DeleteElementTable(void) { if(gHTMLElements) { diff --git a/mozilla/parser/htmlparser/src/nsExpatDriver.cpp b/mozilla/parser/htmlparser/src/nsExpatDriver.cpp index af4673fdac4..d3bb66f514a 100644 --- a/mozilla/parser/htmlparser/src/nsExpatDriver.cpp +++ b/mozilla/parser/htmlparser/src/nsExpatDriver.cpp @@ -306,7 +306,7 @@ IsLoadableDTD(const nsCatalogData* aCatalogData, nsCOMPtr* aDTD) NS_IMPL_ISUPPORTS2(nsExpatDriver, nsITokenizer, - nsIDTD); + nsIDTD) nsresult NS_NewExpatDriver(nsIDTD** aResult) {