From 4d824ff8239a2c7eec06916fb17b58857d6a6945 Mon Sep 17 00:00:00 2001 From: "dveditz%netscape.com" Date: Tue, 15 Feb 2000 02:29:53 +0000 Subject: [PATCH] fixing mac and unix bustage git-svn-id: svn://10.0.0.236/trunk@60787 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/modules/libreg/xpcom/nsRegistry.cpp | 3 ++- mozilla/xpcom/components/nsRegistry.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mozilla/modules/libreg/xpcom/nsRegistry.cpp b/mozilla/modules/libreg/xpcom/nsRegistry.cpp index 780a1f202f1..1056cc74a1a 100644 --- a/mozilla/modules/libreg/xpcom/nsRegistry.cpp +++ b/mozilla/modules/libreg/xpcom/nsRegistry.cpp @@ -614,7 +614,8 @@ NS_IMETHODIMP nsRegistry::GetString(nsRegistryKey baseKey, const PRUnichar *valn rv = GetStringUTF8( baseKey, utf8name, &tmpstr ); if (NS_SUCCEEDED(rv)) { - *_retval = nsTextFormatter::smprintf( L"%s", tmpstr ); + nsString tmpfmt("%s"); + *_retval = nsTextFormatter::smprintf( tmpfmt.GetUnicode(), tmpstr ); nsCRT::free(tmpstr); if ( *_retval == nsnull ) rv = NS_ERROR_OUT_OF_MEMORY; diff --git a/mozilla/xpcom/components/nsRegistry.cpp b/mozilla/xpcom/components/nsRegistry.cpp index 780a1f202f1..1056cc74a1a 100644 --- a/mozilla/xpcom/components/nsRegistry.cpp +++ b/mozilla/xpcom/components/nsRegistry.cpp @@ -614,7 +614,8 @@ NS_IMETHODIMP nsRegistry::GetString(nsRegistryKey baseKey, const PRUnichar *valn rv = GetStringUTF8( baseKey, utf8name, &tmpstr ); if (NS_SUCCEEDED(rv)) { - *_retval = nsTextFormatter::smprintf( L"%s", tmpstr ); + nsString tmpfmt("%s"); + *_retval = nsTextFormatter::smprintf( tmpfmt.GetUnicode(), tmpstr ); nsCRT::free(tmpstr); if ( *_retval == nsnull ) rv = NS_ERROR_OUT_OF_MEMORY;