Back out b27980f1de54 and 39ea8d8f9768 (bug 728429) for potential Windows PGO build bustage on a CLOSED TREE

This commit is contained in:
Phil Ringnalda
2012-02-21 20:01:01 -08:00
parent a431529992
commit 695ef380d2
9 changed files with 26 additions and 270 deletions

View File

@@ -87,8 +87,6 @@ using namespace mozilla;
static PRLogModuleInfo *nsNativeModuleLoaderLog =
PR_NewLogModule("nsNativeModuleLoader");
bool gInXPCOMLoadOnMainThread = false;
#define LOG(level, args) PR_LOG(nsNativeModuleLoaderLog, level, args)
NS_IMPL_QUERY_INTERFACE1(nsNativeModuleLoader,
@@ -169,9 +167,7 @@ nsNativeModuleLoader::LoadModule(FileLocation &aFile)
// We haven't loaded this module before
gInXPCOMLoadOnMainThread = true;
rv = file->Load(&data.library);
gInXPCOMLoadOnMainThread = false;
if (NS_FAILED(rv)) {
char errorMsg[1024] = "<unknown; can't get error from NSPR>";