diff --git a/mozilla/configure b/mozilla/configure
index 48e061f2bbe..3a2dd027c62 100755
--- a/mozilla/configure
+++ b/mozilla/configure
@@ -4498,7 +4498,7 @@ fi
 
 if test "$GNU_CXX"; then
     # Turn on GNU specific features
-    _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} -Wall -Wconversion -Wpointer-arith -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth -Wno-ctor-dtor-privacy"
+    _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} -Wall -Wconversion -Wpointer-arith -Wcast-align -Woverloaded-virtual -Wsynth -Wno-ctor-dtor-privacy"
 
 		if test ! "$QTDIR"; then
     	_WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS}"
diff --git a/mozilla/configure.in b/mozilla/configure.in
index c6924806a33..67e0b2f3063 100644
--- a/mozilla/configure.in
+++ b/mozilla/configure.in
@@ -640,7 +640,7 @@ fi
 
 if test "$GNU_CXX"; then
     # Turn on GNU specific features
-    _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} -Wall -Wconversion -Wpointer-arith -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth -Wno-ctor-dtor-privacy"
+    _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} -Wall -Wconversion -Wpointer-arith -Wcast-align -Woverloaded-virtual -Wsynth -Wno-ctor-dtor-privacy"
 
 	dnl The following warning breaks Qt
 	if test ! "$QTDIR"; then
diff --git a/mozilla/content/base/src/nsCommentNode.cpp b/mozilla/content/base/src/nsCommentNode.cpp
index ccc65f76216..381db7f1989 100644
--- a/mozilla/content/base/src/nsCommentNode.cpp
+++ b/mozilla/content/base/src/nsCommentNode.cpp
@@ -171,7 +171,7 @@ nsCommentNode::List(FILE* out, PRInt32 aIndent) const
   PRInt32 indx;
   for (indx = aIndent; --indx >= 0; ) fputs("  ", out);
 
-  fprintf(out, "Comment@%p refcount=%d<!--", this, mRefCnt);
+  fprintf(out, "Comment@%p refcount=%d<!--", this, mRefCnt.get());
 
   nsAutoString tmp;
   ToCString(tmp, 0, mText.GetLength());
diff --git a/mozilla/content/base/src/nsGenericElement.cpp b/mozilla/content/base/src/nsGenericElement.cpp
index 6c1214b1861..bc7e6a1149f 100644
--- a/mozilla/content/base/src/nsGenericElement.cpp
+++ b/mozilla/content/base/src/nsGenericElement.cpp
@@ -3777,7 +3777,7 @@ nsGenericContainerElement::List(FILE* out, PRInt32 aIndent) const
 
   ListAttributes(out);
 
-  fprintf(out, " refcount=%d<", mRefCnt);
+  fprintf(out, " refcount=%d<", mRefCnt.get());
 
   PRBool canHaveKids;
   CanContainChildren(canHaveKids);
diff --git a/mozilla/content/base/src/nsStyleContext.cpp b/mozilla/content/base/src/nsStyleContext.cpp
index 12d7ab6f8ae..c1a19d99bd6 100644
--- a/mozilla/content/base/src/nsStyleContext.cpp
+++ b/mozilla/content/base/src/nsStyleContext.cpp
@@ -802,7 +802,8 @@ void nsStyleContext::List(FILE* out, PRInt32 aIndent)
   // Indent
   PRInt32 ix;
   for (ix = aIndent; --ix >= 0; ) fputs("  ", out);
-  fprintf(out, "%p(%d) parent=%p ", (void*)this, mRefCnt, (void *)mParent);
+  fprintf(out, "%p(%d) parent=%p ",
+          (void*)this, mRefCnt.get(), (void *)mParent);
   if (mPseudoTag) {
     nsAutoString  buffer;
     mPseudoTag->ToString(buffer);
diff --git a/mozilla/content/base/src/nsTextNode.cpp b/mozilla/content/base/src/nsTextNode.cpp
index cc5644fee69..bed1ddbdd5e 100644
--- a/mozilla/content/base/src/nsTextNode.cpp
+++ b/mozilla/content/base/src/nsTextNode.cpp
@@ -170,7 +170,7 @@ nsTextNode::List(FILE* out, PRInt32 aIndent) const
   PRInt32 index;
   for (index = aIndent; --index >= 0; ) fputs("  ", out);
 
-  fprintf(out, "Text@%p refcount=%d<", this, mRefCnt);
+  fprintf(out, "Text@%p refcount=%d<", this, mRefCnt.get());
 
   nsAutoString tmp;
   ToCString(tmp, 0, mText.GetLength());
diff --git a/mozilla/content/html/content/src/nsGenericHTMLElement.cpp b/mozilla/content/html/content/src/nsGenericHTMLElement.cpp
index 19ece9b43db..e1b003cd299 100644
--- a/mozilla/content/html/content/src/nsGenericHTMLElement.cpp
+++ b/mozilla/content/html/content/src/nsGenericHTMLElement.cpp
@@ -2436,7 +2436,7 @@ nsGenericHTMLElement::List(FILE* out, PRInt32 aIndent) const
 
   ListAttributes(out);
 
-  fprintf(out, " refcount=%d<", mRefCnt);
+  fprintf(out, " refcount=%d<", mRefCnt.get());
 
   PRBool canHaveKids;
   CanContainChildren(canHaveKids);
diff --git a/mozilla/content/xml/content/src/nsXMLCDATASection.cpp b/mozilla/content/xml/content/src/nsXMLCDATASection.cpp
index deef06c9aa5..656b2ab3e79 100644
--- a/mozilla/content/xml/content/src/nsXMLCDATASection.cpp
+++ b/mozilla/content/xml/content/src/nsXMLCDATASection.cpp
@@ -171,7 +171,7 @@ nsXMLCDATASection::List(FILE* out, PRInt32 aIndent) const
   PRInt32 index;
   for (index = aIndent; --index >= 0; ) fputs("  ", out);
 
-  fprintf(out, "CDATASection refcount=%d<", mRefCnt);
+  fprintf(out, "CDATASection refcount=%d<", mRefCnt.get());
 
   nsAutoString tmp;
   ToCString(tmp, 0, mText.GetLength());
diff --git a/mozilla/content/xml/content/src/nsXMLEntity.cpp b/mozilla/content/xml/content/src/nsXMLEntity.cpp
index 2375bef02d5..603b9ac6a69 100644
--- a/mozilla/content/xml/content/src/nsXMLEntity.cpp
+++ b/mozilla/content/xml/content/src/nsXMLEntity.cpp
@@ -189,7 +189,7 @@ nsXMLEntity::List(FILE* out, PRInt32 aIndent) const
   PRInt32 index;
   for (index = aIndent; --index >= 0; ) fputs("  ", out);
 
-  fprintf(out, "Entity refcount=%d<!ENTITY ", mRefCnt);
+  fprintf(out, "Entity refcount=%d<!ENTITY ", mRefCnt.get());
 
   nsAutoString tmp(mName);
   if (!mPublicId.IsEmpty()) {
diff --git a/mozilla/content/xml/content/src/nsXMLNotation.cpp b/mozilla/content/xml/content/src/nsXMLNotation.cpp
index d3996efdb1a..e5a5a6c5289 100644
--- a/mozilla/content/xml/content/src/nsXMLNotation.cpp
+++ b/mozilla/content/xml/content/src/nsXMLNotation.cpp
@@ -178,7 +178,7 @@ nsXMLNotation::List(FILE* out, PRInt32 aIndent) const
   PRInt32 index;
   for (index = aIndent; --index >= 0; ) fputs("  ", out);
 
-  fprintf(out, "Notation refcount=%d<!NOTATION ", mRefCnt);
+  fprintf(out, "Notation refcount=%d<!NOTATION ", mRefCnt.get());
 
   nsAutoString tmp(mName);
   if (!mPublicId.IsEmpty()) {
diff --git a/mozilla/content/xml/content/src/nsXMLProcessingInstruction.cpp b/mozilla/content/xml/content/src/nsXMLProcessingInstruction.cpp
index 5d148b015a2..1823d576490 100644
--- a/mozilla/content/xml/content/src/nsXMLProcessingInstruction.cpp
+++ b/mozilla/content/xml/content/src/nsXMLProcessingInstruction.cpp
@@ -159,7 +159,7 @@ nsXMLProcessingInstruction::List(FILE* out, PRInt32 aIndent) const
   PRInt32 index;
   for (index = aIndent; --index >= 0; ) fputs("  ", out);
 
-  fprintf(out, "Processing instruction refcount=%d<", mRefCnt);
+  fprintf(out, "Processing instruction refcount=%d<", mRefCnt.get());
 
   nsAutoString tmp;
   ToCString(tmp, 0, mText.GetLength());
diff --git a/mozilla/directory/xpcom/base/src/nsLDAPOperation.cpp b/mozilla/directory/xpcom/base/src/nsLDAPOperation.cpp
index efec0f9b9fe..280a95972f7 100644
--- a/mozilla/directory/xpcom/base/src/nsLDAPOperation.cpp
+++ b/mozilla/directory/xpcom/base/src/nsLDAPOperation.cpp
@@ -146,7 +146,7 @@ nsLDAPOperation::SimpleBind(const nsACString& passwd)
 
     PR_LOG(gLDAPLogModule, PR_LOG_DEBUG, 
            ("nsLDAPOperation::SimpleBind(): called; bindName = '%s'; ",
-            bindName));
+            bindName.get()));
 
     mMsgID = ldap_simple_bind(mConnectionHandle, bindName.get(),
                               PromiseFlatCString(passwd).get());
@@ -255,7 +255,9 @@ nsLDAPOperation::SearchExt(const nsACString& aBaseDn, PRInt32 aScope,
     PR_LOG(gLDAPLogModule, PR_LOG_DEBUG, 
            ("nsLDAPOperation::SearchExt(): called with aBaseDn = '%s'; "
             "aFilter = '%s', aAttrCounts = %u, aSizeLimit = %d", 
-            aBaseDn, aFilter, aAttrCount, aSizeLimit));
+            PromiseFlatCString(aBaseDn).get(),
+            PromiseFlatCString(aFilter).get(),
+            aAttrCount, aSizeLimit));
 
     char **attrs = 0;
 
diff --git a/mozilla/js/src/xpconnect/src/nsXPConnect.cpp b/mozilla/js/src/xpconnect/src/nsXPConnect.cpp
index 96de158b35f..07b99462b54 100644
--- a/mozilla/js/src/xpconnect/src/nsXPConnect.cpp
+++ b/mozilla/js/src/xpconnect/src/nsXPConnect.cpp
@@ -1086,7 +1086,7 @@ nsXPConnect::DebugDump(PRInt16 depth)
 {
 #ifdef DEBUG
     depth-- ;
-    XPC_LOG_ALWAYS(("nsXPConnect @ %x with mRefCnt = %d", this, mRefCnt));
+    XPC_LOG_ALWAYS(("nsXPConnect @ %x with mRefCnt = %d", this, mRefCnt.get()));
     XPC_LOG_INDENT();
         XPC_LOG_ALWAYS(("gSelf @ %x", gSelf));
         XPC_LOG_ALWAYS(("gOnceAliveNowDead is %d", (int)gOnceAliveNowDead));
diff --git a/mozilla/js/src/xpconnect/src/xpcwrappedjs.cpp b/mozilla/js/src/xpconnect/src/xpcwrappedjs.cpp
index 24d9b92bf83..e51217822c9 100644
--- a/mozilla/js/src/xpconnect/src/xpcwrappedjs.cpp
+++ b/mozilla/js/src/xpconnect/src/xpcwrappedjs.cpp
@@ -497,7 +497,7 @@ NS_IMETHODIMP
 nsXPCWrappedJS::DebugDump(PRInt16 depth)
 {
 #ifdef DEBUG
-    XPC_LOG_ALWAYS(("nsXPCWrappedJS @ %x with mRefCnt = %d", this, mRefCnt));
+    XPC_LOG_ALWAYS(("nsXPCWrappedJS @ %x with mRefCnt = %d", this, mRefCnt.get()));
         XPC_LOG_INDENT();
 
         PRBool isRoot = mRoot == this;
diff --git a/mozilla/js/src/xpconnect/src/xpcwrappedjsclass.cpp b/mozilla/js/src/xpconnect/src/xpcwrappedjsclass.cpp
index e417895e92a..1b04f54f471 100644
--- a/mozilla/js/src/xpconnect/src/xpcwrappedjsclass.cpp
+++ b/mozilla/js/src/xpconnect/src/xpcwrappedjsclass.cpp
@@ -1599,7 +1599,7 @@ nsXPCWrappedJSClass::DebugDump(PRInt16 depth)
 {
 #ifdef DEBUG
     depth-- ;
-    XPC_LOG_ALWAYS(("nsXPCWrappedJSClass @ %x with mRefCnt = %d", this, mRefCnt));
+    XPC_LOG_ALWAYS(("nsXPCWrappedJSClass @ %x with mRefCnt = %d", this, mRefCnt.get()));
     XPC_LOG_INDENT();
         char* name;
         mInfo->GetName(&name);
diff --git a/mozilla/js/src/xpconnect/src/xpcwrappednative.cpp b/mozilla/js/src/xpconnect/src/xpcwrappednative.cpp
index c414a5d0a79..182446d6ef9 100644
--- a/mozilla/js/src/xpconnect/src/xpcwrappednative.cpp
+++ b/mozilla/js/src/xpconnect/src/xpcwrappednative.cpp
@@ -2320,7 +2320,7 @@ NS_IMETHODIMP XPCWrappedNative::DebugDump(PRInt16 depth)
 {
 #ifdef DEBUG
     depth-- ;
-    XPC_LOG_ALWAYS(("XPCWrappedNative @ %x with mRefCnt = %d", this, mRefCnt));
+    XPC_LOG_ALWAYS(("XPCWrappedNative @ %x with mRefCnt = %d", this, mRefCnt.get()));
     XPC_LOG_INDENT();
 
         if(HasProto())
diff --git a/mozilla/js/src/xpconnect/tests/TestXPC.cpp b/mozilla/js/src/xpconnect/tests/TestXPC.cpp
index 9354b381aac..a3710d6ef62 100644
--- a/mozilla/js/src/xpconnect/tests/TestXPC.cpp
+++ b/mozilla/js/src/xpconnect/tests/TestXPC.cpp
@@ -472,8 +472,8 @@ TestArgFormatter(JSContext* jscontext, JSObject* glob, nsIXPConnect* xpc)
 
     if(!JS_ConvertArguments(jscontext, 5, argv, "s %ip %iv %is s",
                             &a_out, 
-                            getter_AddRefs(b_out), 
-                            getter_AddRefs(c_out),
+                            NS_STATIC_CAST(nsISupports**, getter_AddRefs(b_out)), 
+                            NS_STATIC_CAST(nsIVariant**, getter_AddRefs(c_out)),
                             NS_STATIC_CAST(nsAString*, &d_out), 
                             &e_out))
     {
diff --git a/mozilla/js/src/xpconnect/tests/components/xpctest_noisy.cpp b/mozilla/js/src/xpconnect/tests/components/xpctest_noisy.cpp
index de1286a5e22..fab9d27fb80 100644
--- a/mozilla/js/src/xpconnect/tests/components/xpctest_noisy.cpp
+++ b/mozilla/js/src/xpconnect/tests/components/xpctest_noisy.cpp
@@ -61,7 +61,7 @@ NS_IMETHODIMP_(nsrefcnt) xpctestNoisy::AddRef(void)
   NS_PRECONDITION(PRInt32(mRefCnt) >= 0, "illegal refcnt");
   ++mRefCnt;
   NS_LOG_ADDREF(this, mRefCnt, "xpctestNoisy", sizeof(*this));
-  printf("Noisy %d - incremented refcount to %d\n", mID, mRefCnt);
+  printf("Noisy %d - incremented refcount to %d\n", mID, mRefCnt.get());
   return mRefCnt;
 }
 
@@ -69,7 +69,7 @@ NS_IMETHODIMP_(nsrefcnt) xpctestNoisy::Release(void)
 {
   NS_PRECONDITION(0 != mRefCnt, "dup release");
   --mRefCnt;
-  printf("Noisy %d - decremented refcount to %d\n", mID, mRefCnt);
+  printf("Noisy %d - decremented refcount to %d\n", mID, mRefCnt.get());
   NS_LOG_RELEASE(this, mRefCnt, "xpctestNoisy");
   if (mRefCnt == 0) {
     NS_DELETEXPCOM(this);
diff --git a/mozilla/layout/style/nsStyleContext.cpp b/mozilla/layout/style/nsStyleContext.cpp
index 12d7ab6f8ae..c1a19d99bd6 100644
--- a/mozilla/layout/style/nsStyleContext.cpp
+++ b/mozilla/layout/style/nsStyleContext.cpp
@@ -802,7 +802,8 @@ void nsStyleContext::List(FILE* out, PRInt32 aIndent)
   // Indent
   PRInt32 ix;
   for (ix = aIndent; --ix >= 0; ) fputs("  ", out);
-  fprintf(out, "%p(%d) parent=%p ", (void*)this, mRefCnt, (void *)mParent);
+  fprintf(out, "%p(%d) parent=%p ",
+          (void*)this, mRefCnt.get(), (void *)mParent);
   if (mPseudoTag) {
     nsAutoString  buffer;
     mPseudoTag->ToString(buffer);
diff --git a/mozilla/webshell/tests/viewer/nsXPBaseWindow.cpp b/mozilla/webshell/tests/viewer/nsXPBaseWindow.cpp
index 33f58e44258..eb37dbfbc58 100644
--- a/mozilla/webshell/tests/viewer/nsXPBaseWindow.cpp
+++ b/mozilla/webshell/tests/viewer/nsXPBaseWindow.cpp
@@ -74,13 +74,6 @@
 #include "nsXPIDLString.h"
 #include "nsReadableUtils.h"
 
-
-#if defined(WIN32) || defined(XP_OS2_VACPP)
-#include <strstrea.h>
-#else
-#include <strstream.h>
-#endif
-
 #include <ctype.h> // tolower
 
 // XXX For font setting below
diff --git a/mozilla/xpcom/glue/nsISupportsImpl.h b/mozilla/xpcom/glue/nsISupportsImpl.h
index b00ed59a503..1da815a6840 100644
--- a/mozilla/xpcom/glue/nsISupportsImpl.h
+++ b/mozilla/xpcom/glue/nsISupportsImpl.h
@@ -97,6 +97,7 @@ class nsAutoRefCnt {
     
     nsrefcnt operator=(nsrefcnt aValue) { return (mValue = aValue); }
     operator nsrefcnt() const { return mValue; }
+    nsrefcnt get() const { return mValue; }
  private:
     // do not define these to enforce the faster prefix notation
     nsrefcnt operator++(int);
diff --git a/mozilla/xpcom/typelib/xpidl/xpidl.h b/mozilla/xpcom/typelib/xpidl/xpidl.h
index 23ab651fbdf..e85be7b7cb0 100644
--- a/mozilla/xpcom/typelib/xpidl/xpidl.h
+++ b/mozilla/xpcom/typelib/xpidl/xpidl.h
@@ -60,7 +60,7 @@
 /*
  * IDL_tree_warning bombs on libIDL version 6.5, and I don't want to not write
  * warnings... so I define a versioned one here.  Thanks to Mike Shaver for the
- * ## idiom, that allows us to pass through varargs calls.
+ * this solution, which allows us to pass through varargs calls.
  */
 #if !(LIBIDL_MAJOR_VERSION == 0 && LIBIDL_MINOR_VERSION == 6 && \
       LIBIDL_MICRO_VERSION == 5) && !defined(DEBUG_shaver)
@@ -71,10 +71,10 @@
  * parens, e.g. XPIDL_WARNING((foo, bar, "sil"))
  *
  * Probably best removed when we leave 6.5.  */
-#define XPIDL_WARNING(x) IDL_tree_warning##x
+#define XPIDL_WARNING(x) IDL_tree_warning x
 #else
 extern void xpidl_tree_warning(IDL_tree p, int level, const char *fmt, ...);
-#define XPIDL_WARNING(x) xpidl_tree_warning##x
+#define XPIDL_WARNING(x) xpidl_tree_warning x
 #endif
 
 /*