From 1a23aa67fe0b1c1fb8d7224623ff3d77f25adae1 Mon Sep 17 00:00:00 2001 From: Trevor Gross Date: Sat, 16 Nov 2024 21:59:52 -0600 Subject: [PATCH] dragonfly: Add a note for items that differ between the branches Trying to sync these branches up is pretty tricky. Add comments as indicators when the diff between `main` and `libc-0.2` is expected to be different. --- src/unix/bsd/freebsdlike/dragonfly/errno.rs | 2 ++ src/unix/bsd/freebsdlike/dragonfly/mod.rs | 1 + 2 files changed, 3 insertions(+) diff --git a/src/unix/bsd/freebsdlike/dragonfly/errno.rs b/src/unix/bsd/freebsdlike/dragonfly/errno.rs index 5fe6bb89cf2e5..5ec0f2ed5fd00 100644 --- a/src/unix/bsd/freebsdlike/dragonfly/errno.rs +++ b/src/unix/bsd/freebsdlike/dragonfly/errno.rs @@ -1,3 +1,5 @@ +/* DIFF(main): module removed in de76fee6 */ + // DragonFlyBSD's __error function is declared with "static inline", so it must // be implemented in the libc crate, as a pointer to a static thread_local. f! { diff --git a/src/unix/bsd/freebsdlike/dragonfly/mod.rs b/src/unix/bsd/freebsdlike/dragonfly/mod.rs index 6d778476fa444..c6d7370359e1e 100644 --- a/src/unix/bsd/freebsdlike/dragonfly/mod.rs +++ b/src/unix/bsd/freebsdlike/dragonfly/mod.rs @@ -1737,6 +1737,7 @@ extern "C" { ) -> vm_map_entry_t; } +// DIFF(main): module removed in de76fee6 cfg_if! { if #[cfg(libc_thread_local)] { mod errno;