Merge trunk changes.

git-svn-id: svn://10.0.0.236/branches/ZAP_20050610_BRANCH@239127 18797224-902f-48f8-a5cc-f745e15eee43
2007-11-10 13:08:25 +00:00
parent a42cd23ab5
commit ff281aa6a6
13 changed files with 907 additions and 918 deletions
--- a/mozilla/xpcom/io/nsScriptableInputStream.cpp
+++ b/mozilla/xpcom/io/nsScriptableInputStream.cpp
@@ -215,7 +215,7 @@ nsScriptableInputStream::ReadBoolean(PRBool* aBoolean)
 {
  PRUint8 byteResult;
  nsresult rv = Read8(&byteResult);
-  *aBoolean = byteResult;
+  *aBoolean = !!byteResult;
  return rv;
 }