diff -r 000000000000 -r 6474c204b198 netwerk/protocol/wyciwyg/nsWyciwyg.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/netwerk/protocol/wyciwyg/nsWyciwyg.h	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,60 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef nsWyciwyg_h__
+#define nsWyciwyg_h__
+
+#if defined(MOZ_LOGGING)
+#define FORCE_PR_LOG
+#endif
+
+// e10s mess: IPDL-generatd headers include chromium which both #includes
+// prlog.h, and #defines LOG in conflict with this file.
+// Solution: (as described in bug 545995)
+// 1) ensure that this file is #included before any IPDL-generated files and
+//    anything else that #includes prlog.h, so that we can make sure prlog.h
+//    sees FORCE_PR_LOG if needed.
+// 2) #include IPDL boilerplate, and then undef LOG so our LOG wins.
+// 3) nsNetModule.cpp does its own crazy stuff with #including prlog.h
+//    multiple times; allow it to define ALLOW_LATE_NSHTTP_H_INCLUDE to bypass
+//    check. 
+#if defined(PR_LOG) && !defined(ALLOW_LATE_NSHTTP_H_INCLUDE)
+#error "If nsWyciwyg.h #included it must come before any IPDL-generated files or other files that #include prlog.h"
+#endif
+#include "mozilla/net/NeckoChild.h"
+#undef LOG
+
+#include "prlog.h"
+
+#if defined(PR_LOGGING)
+//
+// Log module for HTTP Protocol logging...
+//
+// To enable logging (see prlog.h for full details):
+//
+//    set NSPR_LOG_MODULES=nsWyciwyg:5
+//    set NSPR_LOG_FILE=wyciwyg.log
+//
+// this enables PR_LOG_ALWAYS level information and places all output in
+// the file wyciwyg.log
+//
+extern PRLogModuleInfo *gWyciwygLog;
+#endif
+
+// http logging
+#define LOG1(args) PR_LOG(gWyciwygLog, 1, args)
+#define LOG2(args) PR_LOG(gWyciwygLog, 2, args)
+#define LOG3(args) PR_LOG(gWyciwygLog, 3, args)
+#define LOG4(args) PR_LOG(gWyciwygLog, 4, args)
+#define LOG(args) LOG4(args)
+
+#define LOG1_ENABLED() PR_LOG_TEST(gWyciwygLog, 1)
+#define LOG2_ENABLED() PR_LOG_TEST(gWyciwygLog, 2)
+#define LOG3_ENABLED() PR_LOG_TEST(gWyciwygLog, 3)
+#define LOG4_ENABLED() PR_LOG_TEST(gWyciwygLog, 4)
+#define LOG_ENABLED() LOG4_ENABLED()
+
+#define WYCIWYG_TYPE "text/html"
+
+#endif // nsWyciwyg_h__