summaryrefslogtreecommitdiffstats
path: root/js/src
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-02-19 09:58:44 +0100
committerwolfbeast <mcwerewolf@gmail.com>2018-02-19 09:58:44 +0100
commit85edb1c711f7816ed1a30edd07b37d314fac216a (patch)
tree814487cc06993dd6e133ab4b23e5bc16b6cb5e2d /js/src
parentbc9ad467f0886f8799c2c4781b1a0b654b362ecf (diff)
downloadUXP-85edb1c711f7816ed1a30edd07b37d314fac216a.tar
UXP-85edb1c711f7816ed1a30edd07b37d314fac216a.tar.gz
UXP-85edb1c711f7816ed1a30edd07b37d314fac216a.tar.lz
UXP-85edb1c711f7816ed1a30edd07b37d314fac216a.tar.xz
UXP-85edb1c711f7816ed1a30edd07b37d314fac216a.zip
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.
Diffstat (limited to 'js/src')
-rw-r--r--js/src/old-configure.in3
-rw-r--r--js/src/vm/Stopwatch.h6
2 files changed, 4 insertions, 5 deletions
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)
{ }