Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove a bunch of winapi 0.2 crates #22703

Merged
merged 2 commits into from Jan 16, 2019
Merged
Changes from all commits
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

Some generated files are not rendered by default. Learn more.

@@ -13,4 +13,4 @@ path = "lib.rs"
jemalloc-sys = { version = "0.1.4" }

[target.'cfg(windows)'.dependencies]
kernel32-sys = { version = "0.2.1" }
winapi = { version = "0.3", features = ["heapapi"] }
@@ -98,9 +98,9 @@ mod platform {

#[cfg(windows)]
mod platform {
use kernel32::{GetProcessHeap, HeapSize, HeapValidate};
pub use std::alloc::System as Allocator;
use std::os::raw::c_void;
use winapi::um::heapapi::{GetProcessHeap, HeapSize, HeapValidate};

/// Get the size of a heap block.
pub unsafe extern "C" fn usable_size(mut ptr: *const c_void) -> usize {
@@ -60,9 +60,7 @@ osmesa-sys = "0.1.2"
x11 = "2.0.0"

[target.'cfg(target_os = "windows")'.dependencies]
winapi = "0.2"
user32-sys = "0.2"
gdi32-sys = "0.2"
winapi = { version = "0.3", features = ["wingdi", "winuser"] }

[target.'cfg(any(target_os = "macos", all(target_arch = "x86_64", target_os = "linux")))'.dependencies]
osmesa-src = {git = "https://github.com/servo/osmesa-src"}
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.