--- mozilla/xpcom/ds/nsTextFormatter.h	Tue Apr 24 23:14:17 2001
+++ mozilla/xpcom/ds/nsTextFormatter.h.orig	Tue Apr 24 23:13:54 2001
@@ -52,7 +52,7 @@
 ** of the buffer. Returns the length of the written output, NOT including
 ** the NUL, or (PRUint32)-1 if an error occurs.
 */
+static PRUint32  (snprintf)(PRUnichar *out, PRUint32 outlen, const PRUnichar *fmt, ...);
-static PRUint32  snprintf(PRUnichar *out, PRUint32 outlen, const PRUnichar *fmt, ...);
 
 /*
 ** sprintf into a PR_MALLOC'd buffer. Return a pointer to the malloc'd
--- mozilla/js/src/xpconnect/shell/xpcshell.cpp.orig	Wed Apr 25 00:03:22 2001
+++ mozilla/js/src/xpconnect/shell/xpcshell.cpp	Wed Apr 25 00:04:34 2001
@@ -328,7 +328,7 @@
         fclose(js_DumpGCHeap);
     js_DumpGCHeap = NULL;
 #endif
-    fprintf(gOutFile, "before %lu, after %lu, break %08lx\n",
+    (fprintf)(gOutFile, "before %lu, after %lu, break %08lx\n",
            (unsigned long)preBytes, (unsigned long)rt->gcBytes,
 #ifdef XP_UNIX
            (unsigned long)sbrk(0)
--- mozilla.orig/xpcom/ds/nsTextFormatter.cpp	Mon Dec 31 20:46:00 2001
+++ mozilla/xpcom/ds/nsTextFormatter.cpp	Mon Dec 31 20:51:38 2001
@@ -27,6 +27,8 @@
  *   Daniele Nicolodi  <daniele@grinta.net>
  */
 
+#define __NO_FORMATGUARD_
+
 #include <stdarg.h>
 #include <stddef.h>
 #include <stdio.h>