From 1a92c46ad756c20e1d7ca3e3bfb66d73878c6fd6 Mon Sep 17 00:00:00 2001 From: Lucas Kent Date: Fri, 24 May 2019 21:10:49 +1000 Subject: [PATCH] Fix warnings on linux (#879) --- src/platform/linux/dlopen.rs | 2 +- src/platform/linux/wayland/mod.rs | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/src/platform/linux/dlopen.rs b/src/platform/linux/dlopen.rs index d9ad3fb21..84796d1f1 100644 --- a/src/platform/linux/dlopen.rs +++ b/src/platform/linux/dlopen.rs @@ -6,7 +6,7 @@ use std::os::raw::{c_void, c_char, c_int}; pub const RTLD_LAZY: c_int = 0x001; pub const RTLD_NOW: c_int = 0x002; -#[link="dl"] +#[link(name = "dl")] extern { pub fn dlopen(filename: *const c_char, flag: c_int) -> *mut c_void; pub fn dlerror() -> *mut c_char; diff --git a/src/platform/linux/wayland/mod.rs b/src/platform/linux/wayland/mod.rs index 659cb7af1..e938b8a74 100644 --- a/src/platform/linux/wayland/mod.rs +++ b/src/platform/linux/wayland/mod.rs @@ -16,21 +16,9 @@ mod window; #[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)] pub struct DeviceId; -impl DeviceId { - pub unsafe fn dummy() -> Self { - DeviceId - } -} - #[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)] pub struct WindowId(usize); -impl WindowId { - pub unsafe fn dummy() -> Self { - WindowId(0) - } -} - #[inline] fn make_wid(s: &Proxy) -> WindowId { WindowId(s.c_ptr() as usize)