diff --git a/mozilla/htmlparser/src/COtherElements.h b/mozilla/htmlparser/src/COtherElements.h
index 190d6397e6a..f82afdc2f01 100644
--- a/mozilla/htmlparser/src/COtherElements.h
+++ b/mozilla/htmlparser/src/COtherElements.h
@@ -2490,7 +2490,7 @@ void CElementTable::DebugDumpInlineElements(const char* aTitle) {
       result=theTag->IsInlineElement(eHTMLTag_unknown);
       if(result) {
         const PRUnichar *t = nsHTMLTags::GetStringValue(theTag->mTag);
-        printf("  %s\n", NS_ConvertUCS2toUTF8(t));
+        printf("  %s\n", NS_ConvertUCS2toUTF8(t).get());
       }
     }
     theTagID++;
diff --git a/mozilla/layout/generic/nsBlockFrame.cpp b/mozilla/layout/generic/nsBlockFrame.cpp
index 4272ec3cd18..b1932264fb0 100644
--- a/mozilla/layout/generic/nsBlockFrame.cpp
+++ b/mozilla/layout/generic/nsBlockFrame.cpp
@@ -2604,7 +2604,7 @@ nsBlockFrame::ReflowLine(nsBlockReflowState& aState,
       aLine->mMaximumWidth = aLine->mBounds.XMost();
 #ifdef NOISY_MAXIMUM_WIDTH
       printf("nsBlockFrame::ReflowLine block %p line %p setting aLine.mMaximumWidth to %d\n", 
-             this, aLine, aLine->mMaximumWidth);
+             this, NS_STATIC_CAST(void*, aLine.get()), aLine->mMaximumWidth);
 #endif
       aState.UpdateMaximumWidth(aLine->mMaximumWidth);
 
@@ -2634,7 +2634,7 @@ nsBlockFrame::ReflowLine(nsBlockReflowState& aState,
         {
 #ifdef NOISY_MAXIMUM_WIDTH
           printf("nsBlockFrame::ReflowLine block %p line %p setting aLine.mMaximumWidth to %d\n", 
-                 this, aLine, aLine->mMaximumWidth);
+                 this, NS_STATIC_CAST(void*, aLine.get()), aLine->mMaximumWidth);
 #endif
           aState.UpdateMaximumWidth(aLine->mMaximumWidth);
         }
@@ -2644,7 +2644,7 @@ nsBlockFrame::ReflowLine(nsBlockReflowState& aState,
           if (gNoisyMaxElementSize) {
             IndentBy(stdout, gNoiseIndent);
             printf("nsBlockFrame::ReflowLine block %p line %p setting aLine.mMaxElementWidth to %d\n", 
-                   this, aLine, aLine->mMaxElementWidth);
+                   this, NS_STATIC_CAST(void*, aLine.get()), aLine->mMaxElementWidth);
           }
 #endif
           aState.UpdateMaxElementSize(nsSize(aLine->mMaxElementWidth, aLine->mBounds.height));
@@ -2667,7 +2667,7 @@ nsBlockFrame::ReflowLine(nsBlockReflowState& aState,
              this, aDamageDirtyArea ? "aDamageDirtyArea" : "aLine->IsForceInvalidate",
              dirtyRect.x, dirtyRect.y, dirtyRect.width, dirtyRect.height);
       if (aLine->IsForceInvalidate())
-        printf("  dirty line is %p\n");
+        printf("  dirty line is %p\n", NS_STATIC_CAST(void*, aLine.get());
 #endif
       if (!dirtyRect.IsEmpty()) {
         Invalidate(aState.mPresContext, dirtyRect);
@@ -4371,7 +4371,7 @@ nsBlockFrame::PlaceLine(nsBlockReflowState& aState,
       if (gNoisyMaxElementSize) {
         IndentBy(stdout, gNoiseIndent);
         printf ("nsBlockFrame::PlaceLine: %p setting MES for line %p to %d\n", 
-                this, aLine, maxElementSize.width);
+                this, NS_STATIC_CAST(void*, aLine.get()), maxElementSize.width);
       }
 #endif
     }
diff --git a/mozilla/layout/html/base/src/nsBlockFrame.cpp b/mozilla/layout/html/base/src/nsBlockFrame.cpp
index 4272ec3cd18..b1932264fb0 100644
--- a/mozilla/layout/html/base/src/nsBlockFrame.cpp
+++ b/mozilla/layout/html/base/src/nsBlockFrame.cpp
@@ -2604,7 +2604,7 @@ nsBlockFrame::ReflowLine(nsBlockReflowState& aState,
       aLine->mMaximumWidth = aLine->mBounds.XMost();
 #ifdef NOISY_MAXIMUM_WIDTH
       printf("nsBlockFrame::ReflowLine block %p line %p setting aLine.mMaximumWidth to %d\n", 
-             this, aLine, aLine->mMaximumWidth);
+             this, NS_STATIC_CAST(void*, aLine.get()), aLine->mMaximumWidth);
 #endif
       aState.UpdateMaximumWidth(aLine->mMaximumWidth);
 
@@ -2634,7 +2634,7 @@ nsBlockFrame::ReflowLine(nsBlockReflowState& aState,
         {
 #ifdef NOISY_MAXIMUM_WIDTH
           printf("nsBlockFrame::ReflowLine block %p line %p setting aLine.mMaximumWidth to %d\n", 
-                 this, aLine, aLine->mMaximumWidth);
+                 this, NS_STATIC_CAST(void*, aLine.get()), aLine->mMaximumWidth);
 #endif
           aState.UpdateMaximumWidth(aLine->mMaximumWidth);
         }
@@ -2644,7 +2644,7 @@ nsBlockFrame::ReflowLine(nsBlockReflowState& aState,
           if (gNoisyMaxElementSize) {
             IndentBy(stdout, gNoiseIndent);
             printf("nsBlockFrame::ReflowLine block %p line %p setting aLine.mMaxElementWidth to %d\n", 
-                   this, aLine, aLine->mMaxElementWidth);
+                   this, NS_STATIC_CAST(void*, aLine.get()), aLine->mMaxElementWidth);
           }
 #endif
           aState.UpdateMaxElementSize(nsSize(aLine->mMaxElementWidth, aLine->mBounds.height));
@@ -2667,7 +2667,7 @@ nsBlockFrame::ReflowLine(nsBlockReflowState& aState,
              this, aDamageDirtyArea ? "aDamageDirtyArea" : "aLine->IsForceInvalidate",
              dirtyRect.x, dirtyRect.y, dirtyRect.width, dirtyRect.height);
       if (aLine->IsForceInvalidate())
-        printf("  dirty line is %p\n");
+        printf("  dirty line is %p\n", NS_STATIC_CAST(void*, aLine.get());
 #endif
       if (!dirtyRect.IsEmpty()) {
         Invalidate(aState.mPresContext, dirtyRect);
@@ -4371,7 +4371,7 @@ nsBlockFrame::PlaceLine(nsBlockReflowState& aState,
       if (gNoisyMaxElementSize) {
         IndentBy(stdout, gNoiseIndent);
         printf ("nsBlockFrame::PlaceLine: %p setting MES for line %p to %d\n", 
-                this, aLine, maxElementSize.width);
+                this, NS_STATIC_CAST(void*, aLine.get()), maxElementSize.width);
       }
 #endif
     }
diff --git a/mozilla/parser/htmlparser/src/COtherElements.h b/mozilla/parser/htmlparser/src/COtherElements.h
index 190d6397e6a..f82afdc2f01 100644
--- a/mozilla/parser/htmlparser/src/COtherElements.h
+++ b/mozilla/parser/htmlparser/src/COtherElements.h
@@ -2490,7 +2490,7 @@ void CElementTable::DebugDumpInlineElements(const char* aTitle) {
       result=theTag->IsInlineElement(eHTMLTag_unknown);
       if(result) {
         const PRUnichar *t = nsHTMLTags::GetStringValue(theTag->mTag);
-        printf("  %s\n", NS_ConvertUCS2toUTF8(t));
+        printf("  %s\n", NS_ConvertUCS2toUTF8(t).get());
       }
     }
     theTagID++;