From 61eb346deebfadff1fda8d295c58fc3ca2c93225 Mon Sep 17 00:00:00 2001
From: "rickg%netscape.com"
 <rickg%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 3 Jun 1999 18:45:39 +0000
Subject: [PATCH] fix bug 7479 per Erik VanDerPoel

git-svn-id: svn://10.0.0.236/trunk@33545 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/string/obsolete/nsStr.cpp       | 2 +-
 mozilla/xpcom/ds/bufferRoutines.h       | 2 +-
 mozilla/xpcom/ds/nsStr.cpp              | 2 +-
 mozilla/xpcom/string/obsolete/nsStr.cpp | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mozilla/string/obsolete/nsStr.cpp b/mozilla/string/obsolete/nsStr.cpp
index 3292b15c49a..ba22c2a0298 100644
--- a/mozilla/string/obsolete/nsStr.cpp
+++ b/mozilla/string/obsolete/nsStr.cpp
@@ -15,7 +15,7 @@
  * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
  * Reserved.
  */
- 
+  
 /******************************************************************************************
   MODULE NOTES:
 
diff --git a/mozilla/xpcom/ds/bufferRoutines.h b/mozilla/xpcom/ds/bufferRoutines.h
index 260cdb1c096..a16cb9821af 100644
--- a/mozilla/xpcom/ds/bufferRoutines.h
+++ b/mozilla/xpcom/ds/bufferRoutines.h
@@ -205,7 +205,7 @@ void CopyChars1To2(char* aDest,PRInt32 anDestOffset,const char* aSource,PRUint32
 
   //now loop over characters, shifting them left...
   while(first<last) {
-    *to=kIsoLatin1ToUCS2[*first];  
+    *to=(PRUnichar)(*first);  
     to++;
     first++;
   }
diff --git a/mozilla/xpcom/ds/nsStr.cpp b/mozilla/xpcom/ds/nsStr.cpp
index 3292b15c49a..ba22c2a0298 100644
--- a/mozilla/xpcom/ds/nsStr.cpp
+++ b/mozilla/xpcom/ds/nsStr.cpp
@@ -15,7 +15,7 @@
  * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
  * Reserved.
  */
- 
+  
 /******************************************************************************************
   MODULE NOTES:
 
diff --git a/mozilla/xpcom/string/obsolete/nsStr.cpp b/mozilla/xpcom/string/obsolete/nsStr.cpp
index 3292b15c49a..ba22c2a0298 100644
--- a/mozilla/xpcom/string/obsolete/nsStr.cpp
+++ b/mozilla/xpcom/string/obsolete/nsStr.cpp
@@ -15,7 +15,7 @@
  * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
  * Reserved.
  */
- 
+  
 /******************************************************************************************
   MODULE NOTES: