mshtml: Don't mix PRBool pointers with BOOL pointers.
They will be different things after the next Gecko update.
This commit is contained in:
parent
1f197f75f6
commit
5471f357c0
|
@ -2216,8 +2216,15 @@ static nsresult NSAPI nsURI_Equals(nsIURL *iface, nsIURI *other, PRBool *_retval
|
||||||
}
|
}
|
||||||
|
|
||||||
if(ensure_uri(This) && ensure_uri(other_obj)) {
|
if(ensure_uri(This) && ensure_uri(other_obj)) {
|
||||||
hres = IUri_IsEqual(This->uri, other_obj->uri, _retval);
|
BOOL b;
|
||||||
nsres = SUCCEEDED(hres) ? NS_OK : NS_ERROR_FAILURE;
|
|
||||||
|
hres = IUri_IsEqual(This->uri, other_obj->uri, &b);
|
||||||
|
if(SUCCEEDED(hres)) {
|
||||||
|
*_retval = b;
|
||||||
|
nsres = NS_OK;
|
||||||
|
}else {
|
||||||
|
nsres = NS_ERROR_FAILURE;
|
||||||
|
}
|
||||||
}else {
|
}else {
|
||||||
nsres = NS_ERROR_UNEXPECTED;
|
nsres = NS_ERROR_UNEXPECTED;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue