remove NS_DECLARE_ID and replace (where needed) with NS_DEFINE_CID.

DECLARE was declaring kPlatformCharsetCID as extern const, and
DEFINE declares it as static const.  These 2 are incompatible.
r= ftang@netscape.com
a= dp@netscape.com

intl/locale/src/unix/nsCollationUnix.cpp

@@ -38,6 +38,7 @@ static NS_DEFINE_IID(kICollationIID, NS_ICOLLATION_IID);
 static NS_DEFINE_CID(kPosixLocaleFactoryCID, NS_POSIXLOCALEFACTORY_CID);
 static NS_DEFINE_IID(kIPosixLocaleIID, NS_IPOSIXLOCALE_IID);
 static NS_DEFINE_CID(kLocaleServiceCID, NS_LOCALESERVICE_CID);
+static NS_DEFINE_CID(kPlatformCharsetCID, NS_PLATFORMCHARSET_CID);
 
 NS_IMPL_ISUPPORTS(nsCollationUnix, kICollationIID);
 

intl/locale/src/unix/nsDateTimeFormatUnix.cpp

@@ -39,6 +39,7 @@ static NS_DEFINE_CID(kPosixLocaleFactoryCID, NS_POSIXLOCALEFACTORY_CID);
 static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID);
 static NS_DEFINE_IID(kICharsetConverterManagerIID, NS_ICHARSETCONVERTERMANAGER_IID);
 static NS_DEFINE_CID(kLocaleServiceCID, NS_LOCALESERVICE_CID); 
+static NS_DEFINE_CID(kPlatformCharsetCID, NS_PLATFORMCHARSET_CID);
 
 NS_IMPL_ISUPPORTS(nsDateTimeFormatUnix, kIDateTimeFormatIID);
 

intl/uconv/public/nsIPlatformCharset.h

@@ -35,12 +35,6 @@ NS_DECLARE_ID(kIPlatformCharsetIID,
 #define NS_IPLATFORMCHARSET_IID \
 { 0x84b0f181, 0xc6c7, 0x11d2, {0xb3, 0xb0, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70 }}
 
-
-// Class ID for our PlatformCharset implementation
-// {84B0F182-C6C7-11d2-B3B0-00805F8A6670}
-NS_DECLARE_ID(kPlatformCharsetCID,  
- 0x84b0f182, 0xc6c7, 0x11d2, 0xb3, 0xb0, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70 );
-
 #define NS_PLATFORMCHARSET_CID \
 { 0x84b0f182, 0xc6c7, 0x11d2, {0xb3, 0xb0, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70 }}
 

intl/uconv/src/nsUConvModule.cpp

@@ -43,6 +43,7 @@ static NS_DEFINE_CID(kComponentManagerCID, NS_COMPONENTMANAGER_CID);
 static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID);
 static NS_DEFINE_CID(kCharsetMenuCID, NS_CHARSETMENU_CID);
 static NS_DEFINE_CID(kTextToSubURICID, NS_TEXTTOSUBURI_CID);
+static NS_DEFINE_CID(kPlatformCharsetCID, NS_PLATFORMCHARSET_CID);
 
 PRInt32 g_InstanceCount = 0;
 PRInt32 g_LockCount = 0;

xpfe/components/bookmarks/src/nsBookmarksService.cpp

@@ -123,6 +123,7 @@ static NS_DEFINE_CID(kAppShellServiceCID,         NS_APPSHELL_SERVICE_CID);
 static NS_DEFINE_CID(kPrefCID,                    NS_PREF_CID);
 
 static NS_DEFINE_CID(kStringBundleServiceCID,     NS_STRINGBUNDLESERVICE_CID);
+static NS_DEFINE_CID(kPlatformCharsetCID,         NS_PLATFORMCHARSET_CID);
 
 static const char kURINC_BookmarksRoot[]          = "NC:BookmarksRoot"; // XXX?
 static const char kURINC_IEFavoritesRoot[]        = "NC:IEFavoritesRoot"; // XXX?