diff --git a/mozilla/widget/src/gtk/nsAppShell.cpp b/mozilla/widget/src/gtk/nsAppShell.cpp
index 72a37e28478..622b0a98572 100644
--- a/mozilla/widget/src/gtk/nsAppShell.cpp
+++ b/mozilla/widget/src/gtk/nsAppShell.cpp
@@ -41,7 +41,7 @@
 #include "glib.h"
 #include "nslog.h"
 
-NS_IMPL_LOG(nsAppShellLog, 0)
+NS_IMPL_LOG(nsAppShellLog)
 #define PRINTF NS_LOG_PRINTF(nsAppShellLog)
 #define FLUSH  NS_LOG_FLUSH(nsAppShellLog)
 
diff --git a/mozilla/widget/src/gtk/nsClipboard.cpp b/mozilla/widget/src/gtk/nsClipboard.cpp
index 2a683cf15d8..645422cbee1 100644
--- a/mozilla/widget/src/gtk/nsClipboard.cpp
+++ b/mozilla/widget/src/gtk/nsClipboard.cpp
@@ -50,7 +50,7 @@
 #undef NS_IMPL_IDS
 #include "nslog.h"
 
-NS_IMPL_LOG(nsClipboardLog, 0)
+NS_IMPL_LOG(nsClipboardLog)
 #define PRINTF NS_LOG_PRINTF(nsClipboardLog)
 #define FLUSH  NS_LOG_FLUSH(nsClipboardLog)
 
diff --git a/mozilla/widget/src/gtk/nsFileWidget.cpp b/mozilla/widget/src/gtk/nsFileWidget.cpp
index d506a7e3db2..b57e739a587 100644
--- a/mozilla/widget/src/gtk/nsFileWidget.cpp
+++ b/mozilla/widget/src/gtk/nsFileWidget.cpp
@@ -20,15 +20,18 @@
  * Contributor(s): 
  */
 
+#include "nslog.h"
+#undef printf
+#undef fprintf
+
 #include "nsCOMPtr.h"
 #include "nsIServiceManager.h"
 #include "nsICharsetConverterManager.h"
 #include "nsIPlatformCharset.h"
 #include "nsFileWidget.h"
 #include "nsIToolkit.h"
-#include "nslog.h"
 
-NS_IMPL_LOG(nsFileWidgetLog, 0)
+NS_IMPL_LOG(nsFileWidgetLog)
 #define PRINTF NS_LOG_PRINTF(nsFileWidgetLog)
 #define FLUSH  NS_LOG_FLUSH(nsFileWidgetLog)
 
@@ -115,7 +118,7 @@ static void file_cancel_clicked(GtkWidget *w, PRBool *ret)
 
 static gint file_delete_window(GtkWidget *w, gpointer data)
 {
-    PRINTF("window closed\n");
+  PRINTF("window closed\n");
   gtk_main_quit();
   return PR_TRUE;
 }
diff --git a/mozilla/widget/src/gtk/nsFontRetrieverService.cpp b/mozilla/widget/src/gtk/nsFontRetrieverService.cpp
index 3222c23d170..2a3873cabb9 100644
--- a/mozilla/widget/src/gtk/nsFontRetrieverService.cpp
+++ b/mozilla/widget/src/gtk/nsFontRetrieverService.cpp
@@ -33,7 +33,7 @@
 #include "nsFontSizeIterator.h"
 #include "nslog.h"
 
-NS_IMPL_LOG(nsFontRetrieverServiceLog, 0)
+NS_IMPL_LOG(nsFontRetrieverServiceLog)
 #define PRINTF NS_LOG_PRINTF(nsFontRetrieverServiceLog)
 #define FLUSH  NS_LOG_FLUSH(nsFontRetrieverServiceLog)
  
diff --git a/mozilla/widget/src/gtk/nsGtkEventHandler.cpp b/mozilla/widget/src/gtk/nsGtkEventHandler.cpp
index 3894fb691c6..7c1ebfc9ccd 100644
--- a/mozilla/widget/src/gtk/nsGtkEventHandler.cpp
+++ b/mozilla/widget/src/gtk/nsGtkEventHandler.cpp
@@ -42,7 +42,7 @@
 #include <X11/Xutil.h>
 #include "nslog.h"
 
-NS_IMPL_LOG(nsGtkEventHandlerLog, 0)
+NS_IMPL_LOG(nsGtkEventHandlerLog)
 #define PRINTF NS_LOG_PRINTF(nsGtkEventHandlerLog)
 #define FLUSH  NS_LOG_FLUSH(nsGtkEventHandlerLog)
 
diff --git a/mozilla/widget/src/gtk/nsGtkIMEHelper.cpp b/mozilla/widget/src/gtk/nsGtkIMEHelper.cpp
index ad0e9742e0f..630aed8f7e3 100644
--- a/mozilla/widget/src/gtk/nsGtkIMEHelper.cpp
+++ b/mozilla/widget/src/gtk/nsGtkIMEHelper.cpp
@@ -35,7 +35,7 @@
 #include "nsWindow.h"
 #include "nslog.h"
 
-NS_IMPL_LOG(nsGtkIMEHelperLog, 0)
+NS_IMPL_LOG(nsGtkIMEHelperLog)
 #define PRINTF NS_LOG_PRINTF(nsGtkIMEHelperLog)
 #define FLUSH  NS_LOG_FLUSH(nsGtkIMEHelperLog)
 
diff --git a/mozilla/widget/src/gtk/nsLookAndFeel.cpp b/mozilla/widget/src/gtk/nsLookAndFeel.cpp
index 06b92888980..17d7dae9a5f 100644
--- a/mozilla/widget/src/gtk/nsLookAndFeel.cpp
+++ b/mozilla/widget/src/gtk/nsLookAndFeel.cpp
@@ -26,7 +26,7 @@
 #include "nsXPLookAndFeel.h"
 #include "nslog.h"
 
-NS_IMPL_LOG(nsLookAndFeelLog, 0)
+NS_IMPL_LOG(nsLookAndFeelLog)
 #define PRINTF NS_LOG_PRINTF(nsLookAndFeelLog)
 #define FLUSH  NS_LOG_FLUSH(nsLookAndFeelLog)
 
diff --git a/mozilla/widget/src/gtk/nsSound.cpp b/mozilla/widget/src/gtk/nsSound.cpp
index 9d5f373578a..d939f3805bd 100644
--- a/mozilla/widget/src/gtk/nsSound.cpp
+++ b/mozilla/widget/src/gtk/nsSound.cpp
@@ -37,7 +37,7 @@
 #include <gtk/gtk.h>
 #include "nslog.h"
 
-NS_IMPL_LOG(nsSoundLog, 0)
+NS_IMPL_LOG(nsSoundLog)
 #define PRINTF NS_LOG_PRINTF(nsSoundLog)
 #define FLUSH  NS_LOG_FLUSH(nsSoundLog)
 
diff --git a/mozilla/widget/src/gtk/nsTextHelper.cpp b/mozilla/widget/src/gtk/nsTextHelper.cpp
index 501c9c305ba..d53af2d2b12 100644
--- a/mozilla/widget/src/gtk/nsTextHelper.cpp
+++ b/mozilla/widget/src/gtk/nsTextHelper.cpp
@@ -27,7 +27,7 @@
 #include "nsString.h"
 #include "nslog.h"
 
-NS_IMPL_LOG(nsTextHelperLog, 0)
+NS_IMPL_LOG(nsTextHelperLog)
 #define PRINTF NS_LOG_PRINTF(nsTextHelperLog)
 #define FLUSH  NS_LOG_FLUSH(nsTextHelperLog)
 
diff --git a/mozilla/widget/src/gtk/nsWidget.cpp b/mozilla/widget/src/gtk/nsWidget.cpp
index e4dc9b45b65..45fe7678cdb 100644
--- a/mozilla/widget/src/gtk/nsWidget.cpp
+++ b/mozilla/widget/src/gtk/nsWidget.cpp
@@ -44,8 +44,9 @@
 #include "nsIPref.h"
 #include "nsGtkIMEHelper.h"
 #include "nslog.h"
+#undef fprintf
 
-NS_IMPL_LOG(nsWidgetLog, 0)
+NS_IMPL_LOG(nsWidgetLog)
 #define PRINTF NS_LOG_PRINTF(nsWidgetLog)
 #define FLUSH  NS_LOG_FLUSH(nsWidgetLog)
 
diff --git a/mozilla/widget/src/gtk/nsWindow.cpp b/mozilla/widget/src/gtk/nsWindow.cpp
index 8b68df01260..86b2a560be0 100644
--- a/mozilla/widget/src/gtk/nsWindow.cpp
+++ b/mozilla/widget/src/gtk/nsWindow.cpp
@@ -60,7 +60,7 @@
 #include <unistd.h>
 #include "nslog.h"
 
-NS_IMPL_LOG(nsWindowLog, 0)
+NS_IMPL_LOG(nsWindowLog)
 #define PRINTF NS_LOG_PRINTF(nsWindowLog)
 #define FLUSH  NS_LOG_FLUSH(nsWindowLog)
 
diff --git a/mozilla/widget/src/xpwidgets/nsBaseWidget.cpp b/mozilla/widget/src/xpwidgets/nsBaseWidget.cpp
index 7ef4f092548..c7a7430da59 100644
--- a/mozilla/widget/src/xpwidgets/nsBaseWidget.cpp
+++ b/mozilla/widget/src/xpwidgets/nsBaseWidget.cpp
@@ -44,7 +44,7 @@ static PRInt32 gNumWidgets;
 #include "nslog.h"
 #undef fprintf
 
-NS_IMPL_LOG(nsBaseWidgetLog, 0)
+NS_IMPL_LOG(nsBaseWidgetLog)
 #define PRINTF NS_LOG_PRINTF(nsBaseWidgetLog)
 #define FLUSH  NS_LOG_FLUSH(nsBaseWidgetLog)
 
diff --git a/mozilla/widget/src/xpwidgets/nsTransferable.cpp b/mozilla/widget/src/xpwidgets/nsTransferable.cpp
index 8b82ca74b37..3207aa164a0 100644
--- a/mozilla/widget/src/xpwidgets/nsTransferable.cpp
+++ b/mozilla/widget/src/xpwidgets/nsTransferable.cpp
@@ -49,7 +49,7 @@ Notes to self:
 #include "nsSpecialSystemDirectory.h"
 #include "nslog.h"
 
-NS_IMPL_LOG(nsTransferableLog, 0)
+NS_IMPL_LOG(nsTransferableLog)
 #define PRINTF NS_LOG_PRINTF(nsTransferableLog)
 #define FLUSH  NS_LOG_FLUSH(nsTransferableLog)
 
diff --git a/mozilla/widget/src/xpwidgets/nsXPLookAndFeel.cpp b/mozilla/widget/src/xpwidgets/nsXPLookAndFeel.cpp
index e7e917a56a3..bf53915f88b 100644
--- a/mozilla/widget/src/xpwidgets/nsXPLookAndFeel.cpp
+++ b/mozilla/widget/src/xpwidgets/nsXPLookAndFeel.cpp
@@ -24,7 +24,7 @@
 #include "nsIServiceManager.h"
 #include "nslog.h"
 
-NS_IMPL_LOG(nsXPLookAndFeelLog, 0)
+NS_IMPL_LOG(nsXPLookAndFeelLog)
 #define PRINTF NS_LOG_PRINTF(nsXPLookAndFeelLog)
 #define FLUSH  NS_LOG_FLUSH(nsXPLookAndFeelLog)
  
diff --git a/mozilla/widget/timer/src/unix/gtk/nsTimerGtk.cpp b/mozilla/widget/timer/src/unix/gtk/nsTimerGtk.cpp
index ef65b3c9e0a..24c89bba5b2 100644
--- a/mozilla/widget/timer/src/unix/gtk/nsTimerGtk.cpp
+++ b/mozilla/widget/timer/src/unix/gtk/nsTimerGtk.cpp
@@ -29,7 +29,7 @@
 #include "nsCOMPtr.h"
 #include "nslog.h"
 
-NS_IMPL_LOG(nsTimerGtkLog, 0)
+NS_IMPL_LOG(nsTimerGtkLog)
 #define PRINTF NS_LOG_PRINTF(nsTimerGtkLog)
 #define FLUSH  NS_LOG_FLUSH(nsTimerGtkLog)