Add another condition to all the profile code until the cvs modules can be fixed
git-svn-id: svn://10.0.0.236/trunk@27009 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
2ab0c02523
commit
b6761f7b59
@ -33,7 +33,7 @@
|
||||
|
||||
|
||||
// header file for profile manager
|
||||
#ifdef XP_PC
|
||||
#if defined(XP_PC) && defined(BUILD_PROFILE)
|
||||
// include this for _getcwd call
|
||||
#include <direct.h>
|
||||
|
||||
@ -57,7 +57,7 @@ static NS_DEFINE_IID(kIAppShellServiceIID, NS_IAPPSHELL_SERVICE_IID);
|
||||
static NS_DEFINE_IID(kICmdLineServiceIID, NS_ICOMMANDLINE_SERVICE_IID);
|
||||
|
||||
// defined for profileManager
|
||||
#ifdef XP_PC
|
||||
#if defined(XP_PC) && defined(BUILD_PROFILE)
|
||||
static NS_DEFINE_CID(kProfileCID, NS_PROFILE_CID);
|
||||
#endif // XP_PC
|
||||
|
||||
@ -118,7 +118,7 @@ int main(int argc, char* argv[])
|
||||
nsIPref *prefs;
|
||||
|
||||
// initializations for profile manager
|
||||
#ifdef XP_PC
|
||||
#if defined(XP_PC) && defined(BUILD_PROFILE)
|
||||
char * currProfileName=nsnull;
|
||||
char * currProfileDir=nsnull;
|
||||
PRBool profileDirSet = PR_FALSE;
|
||||
@ -137,7 +137,7 @@ int main(int argc, char* argv[])
|
||||
|
||||
char* cmdResult = nsnull;
|
||||
|
||||
#ifdef XP_PC
|
||||
#if defined(XP_PC) && defined(BUILD_PROFILE)
|
||||
profile = nsnull;
|
||||
#endif // XP_PC
|
||||
|
||||
@ -153,7 +153,7 @@ int main(int argc, char* argv[])
|
||||
NS_SetupRegistry_1();
|
||||
|
||||
// get and start the ProfileManager service
|
||||
#ifdef XP_PC
|
||||
#if defined(XP_PC) && defined(BUILD_PROFILE)
|
||||
rv = nsServiceManager::GetService(kProfileCID,
|
||||
nsIProfile::GetIID(),
|
||||
(nsISupports **)&profile);
|
||||
@ -202,7 +202,7 @@ int main(int argc, char* argv[])
|
||||
if (nsnull == urlstr){
|
||||
|
||||
// check for command line arguments for profile manager
|
||||
#ifdef XP_PC
|
||||
#if defined(XP_PC) && defined(BUILD_PROFILE)
|
||||
|
||||
// -P command line option works this way:
|
||||
// apprunner -P profilename
|
||||
@ -314,7 +314,7 @@ int main(int argc, char* argv[])
|
||||
* check if we have a profile directory
|
||||
*/
|
||||
|
||||
#ifdef XP_PC
|
||||
#if defined(XP_PC) && defined(BUILD_PROFILE)
|
||||
if (!profileDirSet) {
|
||||
int numProfiles = 0;
|
||||
profile->GetProfileCount(&numProfiles);
|
||||
@ -536,7 +536,7 @@ done:
|
||||
nsServiceManager::ReleaseService(kPrefCID, prefs);
|
||||
}
|
||||
|
||||
#ifdef XP_PC
|
||||
#if defined(XP_PC) && defined(BUILD_PROFILE)
|
||||
/* Release the global profile... */
|
||||
if (profile) {
|
||||
profile->Shutdown();
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user