From c0c306f17d008b878f31e19954df65ab31614492 Mon Sep 17 00:00:00 2001 From: "tor%cs.brown.edu" Date: Fri, 24 Dec 1999 08:26:20 +0000 Subject: [PATCH] Build bustage patch for SUNWspro so the compiler doesn't choke seeing an "extern" and "static" definition of kPlatformCharsetCID. Removes duplicate definition of PlatformCharsetCID and uses the one from nsIPlatformCharset.h. r=sspitzer --- xpfe/components/bookmarks/src/nsBookmarksService.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/xpfe/components/bookmarks/src/nsBookmarksService.cpp b/xpfe/components/bookmarks/src/nsBookmarksService.cpp index 12db95e405e1..b27f3ff969ca 100644 --- a/xpfe/components/bookmarks/src/nsBookmarksService.cpp +++ b/xpfe/components/bookmarks/src/nsBookmarksService.cpp @@ -20,6 +20,8 @@ * Contributor(s): */ +#define NS_IMPL_IDS + /* The global bookmarks service. */ @@ -115,14 +117,6 @@ static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); static NS_DEFINE_IID(kIIOServiceIID, NS_IIOSERVICE_IID); static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID); -#ifndef NS_IPLATFORMCHARSET_CID -// XXX this CID should be defined elsewhere -#define NS_IPLATFORMCHARSET_CID \ -{ 0x84b0f182, 0xc6c7, 0x11d2, {0xb3, 0xb0, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70 }} -#endif - -static NS_DEFINE_CID(kPlatformCharsetCID, NS_IPLATFORMCHARSET_CID); - static NS_DEFINE_IID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); static NS_DEFINE_IID(kIStringBundleServiceIID, NS_ISTRINGBUNDLESERVICE_IID);