From 71d285e691136c176f61112b84e8ccf764b3f7d2 Mon Sep 17 00:00:00 2001
From: "rickg%netscape.com"
 <rickg%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sun, 25 Apr 1999 02:53:39 +0000
Subject: [PATCH] still trying to fix mac breakage

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

diff --git a/mozilla/base/src/nsString2.cpp b/mozilla/base/src/nsString2.cpp
index 2a1a057735c..e624fea5c9b 100644
--- a/mozilla/base/src/nsString2.cpp
+++ b/mozilla/base/src/nsString2.cpp
@@ -2156,7 +2156,7 @@ nsAutoString2::nsAutoString2(PRUnichar aChar,eCharSize aCharSize) : nsString2(aC
  * @update	gess 1/4/99
  * @param   reference to a subsumeString
  */
-nsAutoString2::nsAutoString2( nsSubsumeStr& aSubsumeStr) :nsString2(aSubsumeStr.mMultibyte) {
+nsAutoString2::nsAutoString2( nsSubsumeStr& aSubsumeStr) :nsString2((eCharSize)aSubsumeStr.mMultibyte) {
   mAgent=0;
   Subsume(*this,aSubsumeStr);
 }
diff --git a/mozilla/string/obsolete/nsString2.cpp b/mozilla/string/obsolete/nsString2.cpp
index 2a1a057735c..e624fea5c9b 100644
--- a/mozilla/string/obsolete/nsString2.cpp
+++ b/mozilla/string/obsolete/nsString2.cpp
@@ -2156,7 +2156,7 @@ nsAutoString2::nsAutoString2(PRUnichar aChar,eCharSize aCharSize) : nsString2(aC
  * @update	gess 1/4/99
  * @param   reference to a subsumeString
  */
-nsAutoString2::nsAutoString2( nsSubsumeStr& aSubsumeStr) :nsString2(aSubsumeStr.mMultibyte) {
+nsAutoString2::nsAutoString2( nsSubsumeStr& aSubsumeStr) :nsString2((eCharSize)aSubsumeStr.mMultibyte) {
   mAgent=0;
   Subsume(*this,aSubsumeStr);
 }
diff --git a/mozilla/xpcom/ds/nsString2.cpp b/mozilla/xpcom/ds/nsString2.cpp
index 2a1a057735c..e624fea5c9b 100644
--- a/mozilla/xpcom/ds/nsString2.cpp
+++ b/mozilla/xpcom/ds/nsString2.cpp
@@ -2156,7 +2156,7 @@ nsAutoString2::nsAutoString2(PRUnichar aChar,eCharSize aCharSize) : nsString2(aC
  * @update	gess 1/4/99
  * @param   reference to a subsumeString
  */
-nsAutoString2::nsAutoString2( nsSubsumeStr& aSubsumeStr) :nsString2(aSubsumeStr.mMultibyte) {
+nsAutoString2::nsAutoString2( nsSubsumeStr& aSubsumeStr) :nsString2((eCharSize)aSubsumeStr.mMultibyte) {
   mAgent=0;
   Subsume(*this,aSubsumeStr);
 }
diff --git a/mozilla/xpcom/string/obsolete/nsString2.cpp b/mozilla/xpcom/string/obsolete/nsString2.cpp
index 2a1a057735c..e624fea5c9b 100644
--- a/mozilla/xpcom/string/obsolete/nsString2.cpp
+++ b/mozilla/xpcom/string/obsolete/nsString2.cpp
@@ -2156,7 +2156,7 @@ nsAutoString2::nsAutoString2(PRUnichar aChar,eCharSize aCharSize) : nsString2(aC
  * @update	gess 1/4/99
  * @param   reference to a subsumeString
  */
-nsAutoString2::nsAutoString2( nsSubsumeStr& aSubsumeStr) :nsString2(aSubsumeStr.mMultibyte) {
+nsAutoString2::nsAutoString2( nsSubsumeStr& aSubsumeStr) :nsString2((eCharSize)aSubsumeStr.mMultibyte) {
   mAgent=0;
   Subsume(*this,aSubsumeStr);
 }