Skip to content

Remove direct libc dependency #517

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.

Sign up for GitHub

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

Open
git-f0x wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove direct libc dependency #517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,9 @@ rustdoc-args = ["--cfg", "docsrs"]
bitflags = "2.4"
bytemuck = { version = "1.13.0", optional = true }
cursor-icon = "1.2.0"
libc = "0.2.148"
log = "0.4"
memmap2 = "0.9.0"
rustix = { version = "1.0.7", features = ["fs", "pipe", "shm"] }
rustix = { version = "1.1.4", features = ["fs", "pipe", "shm"] }
thiserror = "2.0.12"
wayland-backend = "0.3.0"
wayland-client = "0.31.1"
Expand Down
7 changes: 1 addition & 6 deletions src/dmabuf.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use crate::{error::GlobalError, globals::GlobalData, registry::GlobalProxy};
use memmap2::{Mmap, MmapOptions};
use rustix::fs::Dev as dev_t;
use std::{fmt, mem, os::unix::io::BorrowedFd, slice, sync::Mutex};
use wayland_client::{
globals::GlobalList,
Expand All @@ -12,12 +13,6 @@ use wayland_protocols::wp::linux_dmabuf::zv1::client::{
zwp_linux_dmabuf_v1,
};

// Workaround until `libc` updates to FreeBSD 12 ABI
#[cfg(target_os = "freebsd")]
type dev_t = u64;
#[cfg(not(target_os = "freebsd"))]
use libc::dev_t;

/// A preference tranche of dmabuf formats
#[derive(Clone, Debug)]
pub struct DmabufFeedbackTranche {
Expand Down