diff --git a/mozilla/accessible/src/base/nsAccessible.cpp b/mozilla/accessible/src/base/nsAccessible.cpp
index 2a2e05eb8b6..c37bbe29203 100644
--- a/mozilla/accessible/src/base/nsAccessible.cpp
+++ b/mozilla/accessible/src/base/nsAccessible.cpp
@@ -557,7 +557,7 @@ NS_IMETHODIMP nsAccessible::GetAccKeyboardShortcut(nsAString& _retval)
 
 NS_IMETHODIMP nsAccessible::GetAccId(PRInt32 *aAccId)
 {
-  *aAccId = - NS_REINTERPRET_CAST(PRInt32, (mDOMNode.get()));
+  *aAccId = - NS_PTR_TO_INT32(mDOMNode.get());
   return NS_OK;
 }
 
diff --git a/mozilla/accessible/src/xul/nsXULTreeAccessible.cpp b/mozilla/accessible/src/xul/nsXULTreeAccessible.cpp
index 22d5f47fb2f..90425530928 100644
--- a/mozilla/accessible/src/xul/nsXULTreeAccessible.cpp
+++ b/mozilla/accessible/src/xul/nsXULTreeAccessible.cpp
@@ -691,7 +691,7 @@ NS_IMETHODIMP nsXULTreeitemAccessible::GetAccValue(nsAString& _retval)
 NS_IMETHODIMP nsXULTreeitemAccessible::GetAccId(PRInt32 *aAccId)
 {
   // Since mDOMNode is same for all tree item, use |this| pointer as the unique Id
-  *aAccId = - NS_REINTERPRET_CAST(PRInt32, this);
+  *aAccId = - NS_PTR_TO_INT32(this);
   return NS_OK;
 }
 
diff --git a/mozilla/content/html/style/src/nsHTMLAttributes.cpp b/mozilla/content/html/style/src/nsHTMLAttributes.cpp
index 4161c0bb392..6046003b7d5 100644
--- a/mozilla/content/html/style/src/nsHTMLAttributes.cpp
+++ b/mozilla/content/html/style/src/nsHTMLAttributes.cpp
@@ -1314,7 +1314,7 @@ nsHTMLAttributes::HasAttribute(nsIAtom* aAttrName, PRInt32 aNamespaceID) const
       mMapped->HasAttribute(aAttrName))
     return PR_TRUE;
 
-  return (PRBool)HTMLAttribute::FindHTMLAttribute(aAttrName, aNamespaceID, mFirstUnmapped);
+  return (PRBool)(HTMLAttribute::FindHTMLAttribute(aAttrName, aNamespaceID, mFirstUnmapped) != nsnull);
 }
 
 NS_IMETHODIMP
diff --git a/mozilla/xpcom/glue/nsMemory.cpp b/mozilla/xpcom/glue/nsMemory.cpp
index e79b66fe3d1..4a91d19f61a 100644
--- a/mozilla/xpcom/glue/nsMemory.cpp
+++ b/mozilla/xpcom/glue/nsMemory.cpp
@@ -50,7 +50,7 @@ static NS_METHOD FreeGlobalMemory(void)
 }
 
 #define ENSURE_ALLOCATOR \
-  (gMemory ? PR_TRUE : (PRBool) SetupGlobalMemory())
+  (gMemory ? PR_TRUE : (PRBool)(SetupGlobalMemory() != nsnull))
 
 static nsIMemory*
 SetupGlobalMemory()