diff -r 000000000000 -r 6474c204b198 toolkit/library/nsDllMain.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/toolkit/library/nsDllMain.cpp	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,43 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* 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/. */
+ 
+#include <windows.h>
+#include "nsToolkit.h"
+#include "mozilla/Assertions.h"
+#include "mozilla/WindowsVersion.h"
+
+#if defined(__GNUC__)
+// If DllMain gets name mangled, it won't be seen.
+extern "C" {
+#endif
+
+BOOL APIENTRY DllMain(  
+                      HINSTANCE hModule, 
+                      DWORD reason, 
+                      LPVOID lpReserved )
+{
+    switch( reason ) {
+        case DLL_PROCESS_ATTACH:
+            nsToolkit::Startup((HINSTANCE)hModule);
+            break;
+
+        case DLL_THREAD_ATTACH:
+            break;
+    
+        case DLL_THREAD_DETACH:
+            break;
+    
+        case DLL_PROCESS_DETACH:
+            nsToolkit::Shutdown();
+            break;
+
+    }
+
+    return TRUE;
+}
+
+#if defined(__GNUC__)
+} // extern "C"
+#endif