Add CID in #define in additional to declare

intl/uconv/public/nsICharsetAlias.h

@@ -39,6 +39,9 @@ NS_DECLARE_ID(kICharsetAliasIID,\
 NS_DECLARE_ID(kCharsetAliasCID,\
  0x98d41c21, 0xccf3, 0x11d2, 0xb3, 0xb1, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70 );
 
+#define NS_CHARSETALIAS_CID \
+{ 0x98d41c21, 0xccf3, 0x11d2, { 0xb3, 0xb1, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70 }}
+
 #define NS_CHARSETALIAS_PROGID "component://netscape/intl/charsetalias"
 
 class nsICharsetAlias : public nsISupports

intl/uconv/public/nsIPlatformCharset.h

@@ -41,6 +41,9 @@ NS_DECLARE_ID(kIPlatformCharsetIID,
 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 }}
+
 #define NS_PLATFORMCHARSET_PROGID "component://netscape/intl/platformcharset"
 
 typedef enum {

intl/uconv/public/nsIUnicodeDecodeHelper.h

@@ -40,6 +40,8 @@ NS_DECLARE_ID(kIUnicodeDecodeHelperIID,
 // {9CC39FF1-DD5D-11d2-8AAC-00600811A836}
 NS_DECLARE_ID(kUnicodeDecodeHelperCID, 
   0x9cc39ff1, 0xdd5d, 0x11d2, 0x8a, 0xac, 0x0, 0x60, 0x8, 0x11, 0xa8, 0x36);
+#define NS_UNICODEDECODEHELPER_CID \
+{  0x9cc39ff1, 0xdd5d, 0x11d2, {0x8a, 0xac, 0x0, 0x60, 0x8, 0x11, 0xa8, 0x36}}
 
 #define NS_UNICODEDECODEHELPER_PROGID "component://netscape/intl/unicode/decodehelper"
 

intl/uconv/public/nsIUnicodeEncodeHelper.h

@@ -37,6 +37,8 @@ NS_DECLARE_ID(kIUnicodeEncodeHelperIID,
 // {1767FC50-CAA4-11d2-8AA9-00600811A836}
 NS_DECLARE_ID(kUnicodeEncodeHelperCID, 
   0x1767fc50, 0xcaa4, 0x11d2, 0x8a, 0xa9, 0x0, 0x60, 0x8, 0x11, 0xa8, 0x36);
+#define NS_UNICODEENCODEHELPER_CID \
+{ 0x1767fc50, 0xcaa4, 0x11d2, {0x8a, 0xa9, 0x0, 0x60, 0x8, 0x11, 0xa8, 0x36}}
 
 
 #define NS_UNICODEENCODEHELPER_PROGID "component://netscape/intl/unicode/encodehelper"