From 25f85fad7017fd646f481ebe6f08d68d60e4a865 Mon Sep 17 00:00:00 2001
From: "ftang%netscape.com" <ftang%netscape.com>
Date: Tue, 15 Jun 1999 06:49:47 +0000
Subject: [PATCH] fix CID.h file misspell and repeat CID. add ASCII to the
 factory

---
 intl/uconv/ucvlatin/nsUCvLatinCID.h   |  7 ++++---
 intl/uconv/ucvlatin/nsUCvLatinDll.cpp | 14 ++++++++++++++
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/intl/uconv/ucvlatin/nsUCvLatinCID.h b/intl/uconv/ucvlatin/nsUCvLatinCID.h
index 84c63d9510a..e7c2dfe6c03 100644
--- a/intl/uconv/ucvlatin/nsUCvLatinCID.h
+++ b/intl/uconv/ucvlatin/nsUCvLatinCID.h
@@ -536,15 +536,16 @@ NS_DECLARE_ID(kUnicodeToUserDefinedCID,
 
 
 // Class ID for our AsciiToUnicode charset converter
-NS_DECLARE_ID(kUAsciiToUnicodeCID, 
+NS_DECLARE_ID(kAsciiToUnicodeCID, 
 // {BA6151B9-1DFA-11d3-B3BF-00805F8A6670}
 0xba6151b9, 0x1dfa, 0x11d3, 0xb3, 0xbf, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70);
 
 
 // Class ID for our UnicodeToAscii charset converter
 NS_DECLARE_ID(kUnicodeToAsciiCID, 
-// {BA6151B9-1DFA-11d3-B3BF-00805F8A6670}
-0xba6151b9, 0x1dfa, 0x11d3, 0xb3, 0xbf, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70);
+// {BA6151BA-1DFA-11d3-B3BF-00805F8A6670}
+0xba6151ba, 0x1dfa, 0x11d3, 0xb3, 0xbf, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70);
+
 
 
 
diff --git a/intl/uconv/ucvlatin/nsUCvLatinDll.cpp b/intl/uconv/ucvlatin/nsUCvLatinDll.cpp
index 79b291142ed..6e331899f15 100644
--- a/intl/uconv/ucvlatin/nsUCvLatinDll.cpp
+++ b/intl/uconv/ucvlatin/nsUCvLatinDll.cpp
@@ -27,6 +27,7 @@
 #include "nsICharsetConverterInfo.h"
 #include "nsUCvLatinCID.h"
 #include "nsUCvLatinDll.h"
+#include "nsAsciiToUnicode.h"
 #include "nsISO88591ToUnicode.h"
 #include "nsISO88592ToUnicode.h"
 #include "nsISO88593ToUnicode.h"
@@ -75,6 +76,7 @@
 #include "nsUCS2LEToUnicode.h"
 #include "nsT61ToUnicode.h"
 #include "nsUserDefinedToUnicode.h"
+#include "nsUnicodeToAscii.h"
 #include "nsUnicodeToISO88591.h"
 #include "nsUnicodeToISO88592.h"
 #include "nsUnicodeToISO88593.h"
@@ -154,6 +156,12 @@ struct FactoryData
 
 FactoryData g_FactoryData[] =
 {
+  {
+    &kAsciiToUnicodeCID,
+    nsAsciiToUnicode::CreateInstance,
+    "us-ascii",
+    "Unicode"
+  },
   {
     &kISO88591ToUnicodeCID,
     nsISO88591ToUnicode::CreateInstance,
@@ -442,6 +450,12 @@ FactoryData g_FactoryData[] =
     "x-user-defined",
     "Unicode"
   },
+  {
+    &kUnicodeToAsciiCID,
+    nsUnicodeToAscii::CreateInstance,
+    "Unicode",
+    "us-ascii"
+  },
   {
     &kUnicodeToISO88591CID,
     nsUnicodeToISO88591::CreateInstance,