Bug 1582937 - Port bug 1542830: adjustments to mail/app/nsMailApp.cpp. rs=bustage-fix DONTBUILD
authorJorg K <jorgk@jorgk.com>
Sat, 21 Sep 2019 13:17:17 +0200
changeset 36897 1eb948124d131b9e064c5ea44750a03a666544c6
parent 36896 aa01255a8ee0f8272bd22f3c7f88314661643fa0
child 36898 2bd686fea9ae2a4c09c82c4d7e40c89b9db323e2
push id395
push userclokep@gmail.com
push dateMon, 02 Dec 2019 19:38:57 +0000
reviewersbustage-fix
bugs1582937, 1542830
Bug 1582937 - Port bug 1542830: adjustments to mail/app/nsMailApp.cpp. rs=bustage-fix DONTBUILD
mail/app/nsMailApp.cpp
--- a/mail/app/nsMailApp.cpp
+++ b/mail/app/nsMailApp.cpp
@@ -19,29 +19,31 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <time.h>
 
 #include "nsCOMPtr.h"
 #include "nsIFile.h"
 
 #ifdef XP_WIN
+#  include "LauncherProcessWin.h"
+#  include "mozilla/WindowsDllBlocklist.h"
+
 #  define XRE_WANT_ENVIRON
 #  define strcasecmp _stricmp
 #  ifdef MOZ_SANDBOX
 #    include "mozilla/sandboxing/SandboxInitialization.h"
 #  endif
 #endif
 #include "BinaryPath.h"
 
 #include "nsXPCOMPrivate.h"  // for MAXPATHLEN and XPCOM_DLL
 
 #include "mozilla/Sprintf.h"
 #include "mozilla/StartupTimeline.h"
-#include "mozilla/WindowsDllBlocklist.h"
 
 #ifdef LIBFUZZER
 #  include "FuzzerDefs.h"
 #endif
 
 #ifdef MOZ_LINUX_32_SSE2_STARTUP_ERROR
 #  include <cpuid.h>
 #  include "mozilla/Unused.h"