зеркало из https://github.com/mozilla/gecko-dev.git
Bug 801457 - XULRunner windows builds busted since Sep 22 in winEmbed, cannot convert from 'uint32_t' to 'nsresult'. r=bsmedberg a=bajaj
--HG-- extra : rebase_source : 7f6431b13e6080f590547f8433d5efa96b846c5c
This commit is contained in:
Родитель
249a050eab
Коммит
c2c4b275c8
|
@ -198,6 +198,8 @@ int main(int argc, char *argv[])
|
|||
return 5;
|
||||
}
|
||||
|
||||
int result = 0;
|
||||
|
||||
// Scope all the XPCOM stuff
|
||||
{
|
||||
strcpy(lastslash, "\\xulrunner");
|
||||
|
@ -220,7 +222,6 @@ int main(int argc, char *argv[])
|
|||
if (NS_FAILED(rv))
|
||||
return 9;
|
||||
|
||||
int result = 0;
|
||||
if (NS_FAILED(StartupProfile())) {
|
||||
result = 8;
|
||||
}
|
||||
|
@ -235,12 +236,12 @@ int main(int argc, char *argv[])
|
|||
// Mozilla every 1/10th of a second.
|
||||
bool runCondition = true;
|
||||
|
||||
rv = AppCallbacks::RunEventLoop(runCondition);
|
||||
result = AppCallbacks::RunEventLoop(runCondition);
|
||||
}
|
||||
}
|
||||
XRE_TermEmbedding();
|
||||
|
||||
return rv;
|
||||
return result;
|
||||
}
|
||||
|
||||
/* InitializeWindowCreator creates and hands off an object with a callback
|
||||
|
|
Загрузка…
Ссылка в новой задаче