 
 diff --git a/xpcom/glue/ezlogger.h b/xpcom/glue/ezlogger.h
 new file mode 100644
-index 0000000..0b5f8bc
+index 0000000..8f62be9
 --- /dev/null
 +++ b/xpcom/glue/ezlogger.h
-@@ -0,0 +1,231 @@
+@@ -0,0 +1,236 @@
 +#ifndef __EZLOGGER_H__
 +#define __EZLOGGER_H__
 +#include <stdio.h>
 +#include <utility>
 +#include <string>
 +#include <stdint.h>
-+#include <cinttypes>
++#include <inttypes.h> // b2g has no <cinttypes>
 +
 +#ifndef MOZ_XUL // GECKO only
 +#define printf_stderr printf

+#define EZ_LIGHT_GRAY "\033[0;37m"
+#define EZ_WHITE "\033[1;37m"
+
+#include "nsLiteralString.h"
+#include "nsStringFwd.h"
+#include "nsString.h"

+#include "nsDebug.h" //For printf_stderr
+
+#ifdef NS_WARNING_COLOR
+#undef NS_WARNING
+#define NS_WARNING(str)                                       \
+    NS_DebugBreak(NS_DEBUG_WARNING, LIGHT_RED str "\033[m", nullptr, __FILE__, __LINE__)
+#endif
+
+#ifdef MOZ_LOG_886
+#undef MOZ_LOG
+#define REAL_LOG(X) printf_stderr(LIGHT_BLUE X "\033[m")
+#define MOZ_LOG(_module,_level, arg) REAL_LOG arg
+#endif
+
+/*
