commit 979accc19fb297b0e73c515924d5dfe5c8236be4 Author: Tom Ritter tom@mozilla.com Date: Mon May 15 15:49:20 2017 -0500

Bug 1365047 Turn on the Windows DLL Blocklist in MinGW r=aklotz

MozReview-Commit-ID: 3hF7iOdH89P

--HG-- extra : rebase_source : 95614960544ae55b983dbbd40e1036ff236204b3 --- mozglue/build/WindowsDllBlocklist.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mozglue/build/WindowsDllBlocklist.h b/mozglue/build/WindowsDllBlocklist.h index 5afe6b8ceee8..82d4a365351f 100644 --- a/mozglue/build/WindowsDllBlocklist.h +++ b/mozglue/build/WindowsDllBlocklist.h @@ -6,7 +6,7 @@ #ifndef mozilla_windowsdllblocklist_h #define mozilla_windowsdllblocklist_h

-#if defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_X64)) +#if (defined(_MSC_VER) || defined(__MINGW32__)) && (defined(_M_IX86) || defined(_M_X64))

#include <windows.h> #include "mozilla/GuardObjects.h"