From 8fb6f33b9de239f977b30cc6532b75e2eebda0a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Wed, 16 Oct 2019 10:09:07 +0200
Subject: [PATCH] Update to winapi 0.3.8 which is way, way faster to build.

---
 Cargo.toml |  5 ++---
 src/lib.rs | 14 ++++++--------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index ffceb98..27c8569 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -19,11 +19,10 @@ appveyor = { repository = "Elzair/page_size_rs" }
 no_std = ["spin"]
 
 [dependencies]
-spin = { version = "^0.4.5", optional = true }
+spin = { version = "0.5.2", optional = true }
 
 [target.'cfg(unix)'.dependencies]
 libc = "0.2"
 
 [target.'cfg(windows)'.dependencies]
-winapi = "0.2"
-kernel32-sys = "0.2"
\ No newline at end of file
+winapi = { version = "0.3.8", features = ["sysinfoapi"] }
diff --git a/src/lib.rs b/src/lib.rs
index db25889..ac7e904 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -33,15 +33,13 @@ use spin::Once;
 #[cfg(not(feature = "no_std"))]
 extern crate std;
 #[cfg(not(feature = "no_std"))]
-use std::sync::{Once, ONCE_INIT};
+use std::sync::Once;
 
 #[cfg(unix)]
 extern crate libc;
 
 #[cfg(windows)]
 extern crate winapi;
-#[cfg(target_os = "windows")]
-extern crate kernel32;
 
 /// This function retrieves the system's memory page size.
 ///
@@ -80,7 +78,7 @@ fn get_helper() -> usize {
 #[cfg(all(unix, not(feature = "no_std")))]
 #[inline]
 fn get_helper() -> usize {
-    static INIT: Once = ONCE_INIT;
+    static INIT: Once = Once::new();
     static mut PAGE_SIZE: usize = 0;
 
     unsafe {
@@ -122,7 +120,7 @@ fn get_helper() -> usize {
 #[cfg(all(windows, not(feature = "no_std")))]
 #[inline]
 fn get_helper() -> usize {
-    static INIT: Once = ONCE_INIT;
+    static INIT: Once = Once::new();
     static mut PAGE_SIZE: usize = 0;
 
     unsafe {
@@ -142,7 +140,7 @@ fn get_granularity_helper() -> usize {
 #[cfg(all(windows, not(feature = "no_std")))]
 #[inline]
 fn get_granularity_helper() -> usize {
-    static GRINIT: Once = ONCE_INIT;
+    static GRINIT: Once = Once::new();
     static mut GRANULARITY: usize = 0;
 
     unsafe {
@@ -158,8 +156,8 @@ mod windows {
     #[cfg(not(feature = "no_std"))]
     use std::mem;
     
-    use winapi::sysinfoapi::{SYSTEM_INFO, LPSYSTEM_INFO};
-    use kernel32::GetSystemInfo;
+    use winapi::um::sysinfoapi::{SYSTEM_INFO, LPSYSTEM_INFO};
+    use winapi::um::sysinfoapi::GetSystemInfo;
 
     #[inline]
     pub fn get() -> usize {