Bug 1364560 Fix detection of Windows in Skia for MinGW build draft
authorTom Ritter <tom@mozilla.com>
Fri, 22 Sep 2017 01:19:27 -0500
changeset 670225 b30763d4ec8b528c7d3762ae61567f6d0ca44879
parent 670224 b31122052118eb36106d521d7c9e85a80830ba50
child 733176 0ef55e688ea017bfeb5710b65c7d5a1e7830bc38
push id81566
push userbmo:tom@mozilla.com
push dateTue, 26 Sep 2017 04:03:35 +0000
bugs1364560
milestone58.0a1
Bug 1364560 Fix detection of Windows in Skia for MinGW build Windows detection was broken for the MinGW build. This pulls in the upstream patch from https://bugs.chromium.org/p/skia/issues/detail?id=6635 MozReview-Commit-ID: D0ZRIDaPmim
gfx/skia/skia/src/core/SkExecutor.cpp
--- a/gfx/skia/skia/src/core/SkExecutor.cpp
+++ b/gfx/skia/skia/src/core/SkExecutor.cpp
@@ -8,17 +8,17 @@
 #include "SkExecutor.h"
 #include "SkMakeUnique.h"
 #include "SkMutex.h"
 #include "SkSemaphore.h"
 #include "SkSpinlock.h"
 #include "SkTArray.h"
 #include "SkThreadUtils.h"
 
-#if defined(_MSC_VER)
+#if defined(SK_BUILD_FOR_WIN32)
     #include <windows.h>
     static int num_cores() {
         SYSTEM_INFO sysinfo;
         GetNativeSystemInfo(&sysinfo);
         return (int)sysinfo.dwNumberOfProcessors;
     }
 #else
     #include <unistd.h>