Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing bustage to XPCOM_STANDALONE build caused by my check in for bug 64501. sr=jband

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@85293 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
ccarlen%netscape.com
2001-01-22 20:59:37 +00:00
parent fc6813053a
commit 28c7f40755
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mozilla/xpcom/io/nsAppFileLocationProvider.cpp
View File

@@ -29,7 +29,6 @@
#include "nsILocalFile.h"
#include "nsString.h"
#include "nsXPIDLString.h"
#include "nsIChromeRegistry.h"
#if defined(XP_MAC)
@@ -56,11 +55,12 @@
#include <storage/FindDirectory.h>
#endif
static nsresult GetChromeLocale(PRUnichar** localeName);
// IDs
#ifndef XPCOM_STANDALONE
#include "nsIChromeRegistry.h"
static nsresult GetChromeLocale(PRUnichar** localeName);
static NS_DEFINE_CID(kChromeRegistryCID, NS_CHROMEREGISTRY_CID);
#endif
// WARNING: These hard coded names need to go away. They need to
// come from localizable resources
@@ -165,12 +165,14 @@ nsAppFileLocationProvider::GetFile(const char *prop, PRBool *persistant, nsIFile
rv = localFile->AppendRelativePath(DEFAULTS_DIR_NAME);
if (NS_SUCCEEDED(rv)) {
rv = localFile->AppendRelativePath(DEFAULTS_PROFILE_DIR_NAME);
#ifndef XPCOM_STANDALONE
if (NS_SUCCEEDED(rv)) {
nsXPIDLString localeName;
rv = GetChromeLocale(getter_Copies(localeName));
if (NS_SUCCEEDED(rv))
rv = localFile->AppendRelativeUnicodePath(localeName);
}
#endif
}
}
}
@@ -365,6 +367,8 @@ NS_METHOD nsAppFileLocationProvider::GetDefaultUserProfileRoot(nsILocalFile **aL
// Static Routines
//****************************************************************************************
#ifndef XPCOM_STANDALONE
static nsresult GetChromeLocale(PRUnichar** localeName)
{
NS_ENSURE_ARG_POINTER(localeName);
@@ -379,3 +383,5 @@ static nsresult GetChromeLocale(PRUnichar** localeName)
}
return rv;
}
#endif