From 85edb1c711f7816ed1a30edd07b37d314fac216a Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@gmail.com>
Date: Mon, 19 Feb 2018 09:58:44 +0100
Subject: Make the proper Windows APIs natively available to our tree.

Tag #22.
This bypasses custom definitions of some functions for things natively available in Windows 7.
---
 js/src/old-configure.in | 3 +--
 js/src/vm/Stopwatch.h   | 6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'js/src')

diff --git a/js/src/old-configure.in b/js/src/old-configure.in
index bfb14f809..5da81ce3e 100644
--- a/js/src/old-configure.in
+++ b/js/src/old-configure.in
@@ -143,8 +143,7 @@ MOZ_TOOL_VARIABLES
 dnl Special win32 checks
 dnl ========================================================
 
-# Target the Windows 8.1 SDK by default
-WINVER=502
+WINVER=601
 
 case "$target" in
 *-mingw*)
diff --git a/js/src/vm/Stopwatch.h b/js/src/vm/Stopwatch.h
index a1b8bbbcb..38a3eb801 100644
--- a/js/src/vm/Stopwatch.h
+++ b/js/src/vm/Stopwatch.h
@@ -301,9 +301,9 @@ struct PerformanceMonitoring {
 
 #if WINVER >= 0x0600
 struct cpuid_t {
-    WORD group_;
-    BYTE number_;
-    cpuid_t(WORD group, BYTE number)
+    uint16_t group_;
+    uint8_t number_;
+    cpuid_t(uint16_t group, uint8_t number)
         : group_(group),
           number_(number)
     { }
-- 
cgit v1.2.3