Commit 71450fe0 authored by Tatiana Meshkova's avatar Tatiana Meshkova

Make it compile with latest upstream

parent fd561155
......@@ -58,7 +58,7 @@ if test "$OBJ_PATH" != ""; then
SDK_DIR=$OBJ_PATH/dist
IDL_DIR=$OBJ_PATH/dist/idl
ENGINE_CFLAGS="-I$OBJ_PATH/dist/include -I$OBJ_PATH/dist/include/nspr -I$OBJ_PATH/dist/include/mozilla -I$OBJ_PATH/dist/include/dom -I/usr/include/nspr4"
ENGINE_LIBS="-L$OBJ_PATH/dist/sdk/lib -lxpcomglue_s -lxul -lmozalloc"
ENGINE_LIBS="-L$OBJ_PATH/dist/sdk/lib -lxpcomglue_s -lxul"
else
PKG_CHECK_MODULES(ENGINE, libxul $NSPR,
[
......
......@@ -546,7 +546,7 @@ EmbedAuthPromptService::PromptAuth(nsIChannel* aChannel,
return NS_OK;
}
class nsAuthCancelableConsumer MOZ_FINAL : public nsICancelable
class nsAuthCancelableConsumer final : public nsICancelable
{
public:
NS_DECL_ISUPPORTS
......@@ -731,7 +731,7 @@ EmbedAuthPromptService::DoSendAsyncPrompt(EmbedAsyncAuthPrompt* mPrompt)
logins[loginIndex]->GetPassword(password);
NS_RELEASE(logins[loginIndex]);
}
nsMemory::Free(logins);
free(logins);
uint32_t winid;
mService->GetIDByWindow(mPrompt->mWin, &winid);
......@@ -785,7 +785,7 @@ EmbedAuthPromptService::DoSendAsyncPrompt(EmbedAsyncAuthPrompt* mPrompt)
loginMgr->RemoveLogin(logins[loginIndex]);
NS_RELEASE(logins[loginIndex]);
}
nsMemory::Free(logins);
free(logins);
// store credentials to DB
nsCOMPtr<nsILoginInfo> loginInfo = do_CreateInstance("@mozilla.org/login-manager/loginInfo;1" , &rv);
NS_ENSURE_SUCCESS(rv, rv);
......
......@@ -19,7 +19,7 @@ namespace embedlite {
* This class is intended for use by the component manager and the generic
* module.
*/
class EmbedliteGenericFactory MOZ_FINAL : public nsIFactory
class EmbedliteGenericFactory final : public nsIFactory
{
~EmbedliteGenericFactory() {}
......
......@@ -307,7 +307,7 @@ nsEmbedFilePicker::OnMessageReceived(const char* messageName, const char16_t* me
}
}
}
nsMemory::Free(rawArray);
free(rawArray);
}
} else {
NS_ERROR("Unexpected items type");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment