Skip to content

Commit

Permalink
Merge pull request #4076 from tgross35/diff-note-dragonfly
Browse files Browse the repository at this point in the history
[0.2] dragonfly: Add a note for items that differ between the branches
  • Loading branch information
tgross35 authored Nov 17, 2024
2 parents 83120be + 1a23aa6 commit 47467fc
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 0 deletions.
2 changes: 2 additions & 0 deletions src/unix/bsd/freebsdlike/dragonfly/errno.rs
Original file line number Diff line number Diff line change
@@ -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! {
Expand Down
1 change: 1 addition & 0 deletions src/unix/bsd/freebsdlike/dragonfly/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 47467fc

Please sign in to comment.