diff options
Diffstat (limited to 'intl/uconv/src/nsUConvModule.cpp')
| -rw-r--r-- | intl/uconv/src/nsUConvModule.cpp | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/intl/uconv/src/nsUConvModule.cpp b/intl/uconv/src/nsUConvModule.cpp index a13d578df..6650ec1a5 100644 --- a/intl/uconv/src/nsUConvModule.cpp +++ b/intl/uconv/src/nsUConvModule.cpp @@ -163,22 +163,12 @@ #include "nsCP857ToUnicode.h" #include "nsCP862ToUnicode.h" #include "nsCP864ToUnicode.h" -#ifdef XP_OS2 -#include "nsCP869ToUnicode.h" -#include "nsCP1125ToUnicode.h" -#include "nsCP1131ToUnicode.h" -#endif #include "nsUnicodeToCP850.h" #include "nsUnicodeToCP852.h" #include "nsUnicodeToCP855.h" #include "nsUnicodeToCP857.h" #include "nsUnicodeToCP862.h" #include "nsUnicodeToCP864.h" -#ifdef XP_OS2 -#include "nsUnicodeToCP869.h" -#include "nsUnicodeToCP1125.h" -#include "nsUnicodeToCP1131.h" -#endif // ucvja #include "nsUCVJACID.h" @@ -303,11 +293,6 @@ NS_UCONV_REG_UNREG("IBM855", NS_CP855TOUNICODE_CID, NS_UNICODETOCP855_CID) NS_UCONV_REG_UNREG("IBM857", NS_CP857TOUNICODE_CID, NS_UNICODETOCP857_CID) NS_UCONV_REG_UNREG("IBM862", NS_CP862TOUNICODE_CID, NS_UNICODETOCP862_CID) NS_UCONV_REG_UNREG("IBM864", NS_CP864TOUNICODE_CID, NS_UNICODETOCP864_CID) -#ifdef XP_OS2 -NS_UCONV_REG_UNREG("IBM869", NS_CP869TOUNICODE_CID, NS_UNICODETOCP869_CID) -NS_UCONV_REG_UNREG("IBM1125", NS_CP1125TOUNICODE_CID, NS_UNICODETOCP1125_CID) -NS_UCONV_REG_UNREG("IBM1131", NS_CP1131TOUNICODE_CID, NS_UNICODETOCP1131_CID) -#endif // ucvja NS_UCONV_REG_UNREG("Shift_JIS", NS_SJISTOUNICODE_CID, NS_UNICODETOSJIS_CID) @@ -647,22 +632,12 @@ NS_DEFINE_NAMED_CID(NS_CP855TOUNICODE_CID); NS_DEFINE_NAMED_CID(NS_CP857TOUNICODE_CID); NS_DEFINE_NAMED_CID(NS_CP862TOUNICODE_CID); NS_DEFINE_NAMED_CID(NS_CP864TOUNICODE_CID); -#ifdef XP_OS2 -NS_DEFINE_NAMED_CID(NS_CP869TOUNICODE_CID); -NS_DEFINE_NAMED_CID(NS_CP1125TOUNICODE_CID); -NS_DEFINE_NAMED_CID(NS_CP1131TOUNICODE_CID); -#endif NS_DEFINE_NAMED_CID(NS_UNICODETOCP850_CID); NS_DEFINE_NAMED_CID(NS_UNICODETOCP852_CID); NS_DEFINE_NAMED_CID(NS_UNICODETOCP855_CID); NS_DEFINE_NAMED_CID(NS_UNICODETOCP857_CID); NS_DEFINE_NAMED_CID(NS_UNICODETOCP862_CID); NS_DEFINE_NAMED_CID(NS_UNICODETOCP864_CID); -#ifdef XP_OS2 -NS_DEFINE_NAMED_CID(NS_UNICODETOCP869_CID); -NS_DEFINE_NAMED_CID(NS_UNICODETOCP1125_CID); -NS_DEFINE_NAMED_CID(NS_UNICODETOCP1131_CID); -#endif NS_DEFINE_NAMED_CID(NS_SJISTOUNICODE_CID); NS_DEFINE_NAMED_CID(NS_EUCJPTOUNICODE_CID); NS_DEFINE_NAMED_CID( NS_ISO2022JPTOUNICODE_CID); @@ -832,22 +807,12 @@ static const mozilla::Module::CIDEntry kUConvCIDs[] = { { &kNS_CP857TOUNICODE_CID, false, nullptr, nsCP857ToUnicodeConstructor }, { &kNS_CP862TOUNICODE_CID, false, nullptr, nsCP862ToUnicodeConstructor }, { &kNS_CP864TOUNICODE_CID, false, nullptr, nsCP864ToUnicodeConstructor }, -#ifdef XP_OS2 - { &kNS_CP869TOUNICODE_CID, false, nullptr, nsCP869ToUnicodeConstructor }, - { &kNS_CP1125TOUNICODE_CID, false, nullptr, nsCP1125ToUnicodeConstructor }, - { &kNS_CP1131TOUNICODE_CID, false, nullptr, nsCP1131ToUnicodeConstructor }, -#endif { &kNS_UNICODETOCP850_CID, false, nullptr, nsUnicodeToCP850Constructor }, { &kNS_UNICODETOCP852_CID, false, nullptr, nsUnicodeToCP852Constructor }, { &kNS_UNICODETOCP855_CID, false, nullptr, nsUnicodeToCP855Constructor }, { &kNS_UNICODETOCP857_CID, false, nullptr, nsUnicodeToCP857Constructor }, { &kNS_UNICODETOCP862_CID, false, nullptr, nsUnicodeToCP862Constructor }, { &kNS_UNICODETOCP864_CID, false, nullptr, nsUnicodeToCP864Constructor }, -#ifdef XP_OS2 - { &kNS_UNICODETOCP869_CID, false, nullptr, nsUnicodeToCP869Constructor }, - { &kNS_UNICODETOCP1125_CID, false, nullptr, nsUnicodeToCP1125Constructor }, - { &kNS_UNICODETOCP1131_CID, false, nullptr, nsUnicodeToCP1131Constructor }, -#endif { &kNS_SJISTOUNICODE_CID, false, nullptr, nsShiftJISToUnicodeConstructor }, { &kNS_EUCJPTOUNICODE_CID, false, nullptr, nsEUCJPToUnicodeV2Constructor }, { &kNS_ISO2022JPTOUNICODE_CID, false, nullptr, nsISO2022JPToUnicodeV2Constructor }, @@ -1019,22 +984,12 @@ static const mozilla::Module::ContractIDEntry kUConvContracts[] = { { NS_UNICODEDECODER_CONTRACTID_BASE "IBM857", &kNS_CP857TOUNICODE_CID }, { NS_UNICODEDECODER_CONTRACTID_BASE "IBM862", &kNS_CP862TOUNICODE_CID }, { NS_UNICODEDECODER_CONTRACTID_BASE "IBM864", &kNS_CP864TOUNICODE_CID }, -#ifdef XP_OS2 - { NS_UNICODEDECODER_CONTRACTID_BASE "IBM869", &kNS_CP869TOUNICODE_CID }, - { NS_UNICODEDECODER_CONTRACTID_BASE "IBM1125", &kNS_CP1125TOUNICODE_CID }, - { NS_UNICODEDECODER_CONTRACTID_BASE "IBM1131", &kNS_CP1131TOUNICODE_CID }, -#endif { NS_UNICODEENCODER_CONTRACTID_BASE "IBM850", &kNS_UNICODETOCP850_CID }, { NS_UNICODEENCODER_CONTRACTID_BASE "IBM852", &kNS_UNICODETOCP852_CID }, { NS_UNICODEENCODER_CONTRACTID_BASE "IBM855", &kNS_UNICODETOCP855_CID }, { NS_UNICODEENCODER_CONTRACTID_BASE "IBM857", &kNS_UNICODETOCP857_CID }, { NS_UNICODEENCODER_CONTRACTID_BASE "IBM862", &kNS_UNICODETOCP862_CID }, { NS_UNICODEENCODER_CONTRACTID_BASE "IBM864", &kNS_UNICODETOCP864_CID }, -#ifdef XP_OS2 - { NS_UNICODEENCODER_CONTRACTID_BASE "IBM869", &kNS_UNICODETOCP869_CID }, - { NS_UNICODEENCODER_CONTRACTID_BASE "IBM1125", &kNS_UNICODETOCP1125_CID }, - { NS_UNICODEENCODER_CONTRACTID_BASE "IBM1131", &kNS_UNICODETOCP1131_CID }, -#endif { NS_UNICODEDECODER_CONTRACTID_BASE "Shift_JIS", &kNS_SJISTOUNICODE_CID }, { NS_UNICODEDECODER_CONTRACTID_BASE "EUC-JP", &kNS_EUCJPTOUNICODE_CID }, { NS_UNICODEDECODER_CONTRACTID_BASE "ISO-2022-JP", &kNS_ISO2022JPTOUNICODE_CID }, |