Fix Fizilla build bustage caused by conflict between ccarlen's checkin and jag's string changes. r=jag
git-svn-id: svn://10.0.0.236/trunk@104275 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -38,6 +38,8 @@
|
||||
#include "prerror.h"
|
||||
#include "nsEscape.h"
|
||||
|
||||
#include "nsReadableUtils.h"
|
||||
|
||||
#ifdef MACOSX
|
||||
#include "nsXPIDLString.h"
|
||||
|
||||
@@ -1626,7 +1628,7 @@ nsLocalFile::GetPath(char **_retval)
|
||||
if (NS_FAILED(rv))
|
||||
return rv;
|
||||
// When nsIFile params are all nsAString&, we won't have to do this
|
||||
*_retval = fsCharSetPathStr.ToNewCString();
|
||||
*_retval = ToNewCString(fsCharSetPathStr);
|
||||
if (!*_retval)
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user