From cf402a4b8cd70d7ecf4f8c79896a0d47411de22f Mon Sep 17 00:00:00 2001 From: "ftang%netscape.com" Date: Fri, 29 Jan 1999 18:13:32 +0000 Subject: [PATCH] move kLatin1ToUnicodeCID from nsConverterCID.h to nsUCvLatinCID.h --- intl/uconv/makefile.win | 1 + intl/uconv/public/nsConverterCID.h | 5 ----- intl/uconv/ucvlatin/nsLatin1ToUnicode.cpp | 2 +- intl/uconv/ucvlatin/nsUCvLatinCID.h | 5 +++++ 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/intl/uconv/makefile.win b/intl/uconv/makefile.win index d0e14000393d..61dcf41ec72d 100644 --- a/intl/uconv/makefile.win +++ b/intl/uconv/makefile.win @@ -20,6 +20,7 @@ DEPTH=..\.. DIRS=public src \ ucvlatin \ ucvja \ + ucvja2 \ tests include <$(DEPTH)\layout\config\rules.mak> diff --git a/intl/uconv/public/nsConverterCID.h b/intl/uconv/public/nsConverterCID.h index 3521e389cb46..9fb5add7dbba 100644 --- a/intl/uconv/public/nsConverterCID.h +++ b/intl/uconv/public/nsConverterCID.h @@ -22,9 +22,4 @@ #include "nsISupports.h" -// Class ID for our Latin1ToUnicode charset converter -// {A3254CB0-8E20-11d2-8A98-00600811A836} -NS_DECLARE_ID(kLatin1ToUnicodeCID, - 0xa3254cb0, 0x8e20, 0x11d2, 0x8a, 0x98, 0x0, 0x60, 0x8, 0x11, 0xa8, 0x36); - #endif /* nsConverterCID_h___ */ diff --git a/intl/uconv/ucvlatin/nsLatin1ToUnicode.cpp b/intl/uconv/ucvlatin/nsLatin1ToUnicode.cpp index 56df0d7df3a0..8236765c8ce6 100644 --- a/intl/uconv/ucvlatin/nsLatin1ToUnicode.cpp +++ b/intl/uconv/ucvlatin/nsLatin1ToUnicode.cpp @@ -21,7 +21,7 @@ #include "nsIUnicodeDecoder.h" #include "nsLatin1ToUnicode.h" -#include "nsConverterCID.h" +#include "nsUCvLatinCID.h" #include "nsUCvLatinDll.h" //---------------------------------------------------------------------- diff --git a/intl/uconv/ucvlatin/nsUCvLatinCID.h b/intl/uconv/ucvlatin/nsUCvLatinCID.h index 95ea76333390..7a8d0c8c96ab 100644 --- a/intl/uconv/ucvlatin/nsUCvLatinCID.h +++ b/intl/uconv/ucvlatin/nsUCvLatinCID.h @@ -21,6 +21,11 @@ #define nsUCvLatinCID_h___ #include "nsISupports.h" +// Class ID for our Latin1ToUnicode charset converter +// {A3254CB0-8E20-11d2-8A98-00600811A836} +NS_DECLARE_ID(kLatin1ToUnicodeCID, + 0xa3254cb0, 0x8e20, 0x11d2, 0x8a, 0x98, 0x0, 0x60, 0x8, 0x11, 0xa8, 0x36); + // Class ID for our ISO88597ToUnicode charset converter // {AF7A9951-AA48-11d2-B3AE-00805F8A6670}