diff --git a/mozilla/layout/forms/nsGfxRadioControlFrame.cpp b/mozilla/layout/forms/nsGfxRadioControlFrame.cpp
index 2de5e233798..04073d8cf0e 100644
--- a/mozilla/layout/forms/nsGfxRadioControlFrame.cpp
+++ b/mozilla/layout/forms/nsGfxRadioControlFrame.cpp
@@ -149,7 +149,7 @@ nsGfxRadioControlFrame::Paint(nsIPresContext* aPresContext,
 {
  	const nsStyleDisplay* disp = (const nsStyleDisplay*)
 	mStyleContext->GetStyleData(eStyleStruct_Display);
-	if (!disp->mVisible)
+	if (disp->mVisible != NS_STYLE_VISIBILITY_VISIBLE)
 		return NS_OK;
 
      // Paint the background
@@ -173,7 +173,7 @@ void nsGfxRadioControlFrame::SetRadioState(nsIPresContext* aPresContext, PRBool
 	nsFormControlHelper::ForceDrawFrame(aPresContext, this);
 }
 
-#ifdef DEBUG_rods
+#ifdef DEBUG_rodsXXX
 NS_IMETHODIMP 
 nsGfxRadioControlFrame::Reflow(nsIPresContext*          aPresContext, 
                                nsHTMLReflowMetrics&     aDesiredSize,
diff --git a/mozilla/layout/forms/nsGfxRadioControlFrame.h b/mozilla/layout/forms/nsGfxRadioControlFrame.h
index 9443201976d..1cb954bd61b 100644
--- a/mozilla/layout/forms/nsGfxRadioControlFrame.h
+++ b/mozilla/layout/forms/nsGfxRadioControlFrame.h
@@ -64,7 +64,7 @@ public:
                         const nsRect& aDirtyRect);
 
   ///XXX: End o the temporary methods
-#ifdef DEBUG_rods
+#ifdef DEBUG_rodsXXX
   NS_IMETHOD Reflow(nsIPresContext*          aCX,
                     nsHTMLReflowMetrics&     aDesiredSize,
                     const nsHTMLReflowState& aReflowState,
diff --git a/mozilla/layout/html/forms/src/nsGfxRadioControlFrame.cpp b/mozilla/layout/html/forms/src/nsGfxRadioControlFrame.cpp
index 2de5e233798..04073d8cf0e 100644
--- a/mozilla/layout/html/forms/src/nsGfxRadioControlFrame.cpp
+++ b/mozilla/layout/html/forms/src/nsGfxRadioControlFrame.cpp
@@ -149,7 +149,7 @@ nsGfxRadioControlFrame::Paint(nsIPresContext* aPresContext,
 {
  	const nsStyleDisplay* disp = (const nsStyleDisplay*)
 	mStyleContext->GetStyleData(eStyleStruct_Display);
-	if (!disp->mVisible)
+	if (disp->mVisible != NS_STYLE_VISIBILITY_VISIBLE)
 		return NS_OK;
 
      // Paint the background
@@ -173,7 +173,7 @@ void nsGfxRadioControlFrame::SetRadioState(nsIPresContext* aPresContext, PRBool
 	nsFormControlHelper::ForceDrawFrame(aPresContext, this);
 }
 
-#ifdef DEBUG_rods
+#ifdef DEBUG_rodsXXX
 NS_IMETHODIMP 
 nsGfxRadioControlFrame::Reflow(nsIPresContext*          aPresContext, 
                                nsHTMLReflowMetrics&     aDesiredSize,
diff --git a/mozilla/layout/html/forms/src/nsGfxRadioControlFrame.h b/mozilla/layout/html/forms/src/nsGfxRadioControlFrame.h
index 9443201976d..1cb954bd61b 100644
--- a/mozilla/layout/html/forms/src/nsGfxRadioControlFrame.h
+++ b/mozilla/layout/html/forms/src/nsGfxRadioControlFrame.h
@@ -64,7 +64,7 @@ public:
                         const nsRect& aDirtyRect);
 
   ///XXX: End o the temporary methods
-#ifdef DEBUG_rods
+#ifdef DEBUG_rodsXXX
   NS_IMETHOD Reflow(nsIPresContext*          aCX,
                     nsHTMLReflowMetrics&     aDesiredSize,
                     const nsHTMLReflowState& aReflowState,