Skip to content

Commit 9e34676

Browse files
committed
Auto merge of #389 - tbu-:pr_fix_netbsd, r=fiveop
Fix NetBSD build
2 parents 29193ba + c4ae567 commit 9e34676

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

src/sys/event.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ pub fn ev_set(ev: &mut KEvent,
355355
filter: EventFilter,
356356
flags: EventFlag,
357357
fflags: FilterFlag,
358-
udata: i64) {
358+
udata: isize) {
359359

360360
ev.ident = ident as uintptr_t;
361361
ev.filter = filter;

src/sys/mman.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ mod consts {
131131
const MAP_RENAME = libc::MAP_RENAME,
132132
const MAP_NORESERVE = libc::MAP_NORESERVE,
133133
const MAP_HASSEMAPHORE = libc::MAP_HASSEMAPHORE,
134-
#[cfg(not(target_os = "openbsd"))]
134+
#[cfg(not(any(target_os = "openbsd", target_os = "netbsd")))]
135135
const MAP_STACK = libc::MAP_STACK,
136136
#[cfg(target_os = "netbsd")]
137137
const MAP_WIRED = libc::MAP_WIRED,

src/sys/signal.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ pub enum Signal {
2828
SIGPIPE = libc::SIGPIPE,
2929
SIGALRM = libc::SIGALRM,
3030
SIGTERM = libc::SIGTERM,
31-
#[cfg(not(target_os = "macos"))]
31+
#[cfg(any(target_os = "linux", target_os = "android", target_os = "emscripten"))]
3232
SIGSTKFLT = libc::SIGSTKFLT,
3333
SIGCHLD = libc::SIGCHLD,
3434
SIGCONT = libc::SIGCONT,
@@ -43,18 +43,18 @@ pub enum Signal {
4343
SIGPROF = libc::SIGPROF,
4444
SIGWINCH = libc::SIGWINCH,
4545
SIGIO = libc::SIGIO,
46-
#[cfg(not(target_os = "macos"))]
46+
#[cfg(any(target_os = "linux", target_os = "android", target_os = "emscripten"))]
4747
SIGPWR = libc::SIGPWR,
4848
SIGSYS = libc::SIGSYS,
49-
#[cfg(target_os = "macos")]
49+
#[cfg(not(any(target_os = "linux", target_os = "android", target_os = "emscripten")))]
5050
SIGEMT = libc::SIGEMT,
51-
#[cfg(target_os = "macos")]
51+
#[cfg(not(any(target_os = "linux", target_os = "android", target_os = "emscripten")))]
5252
SIGINFO = libc::SIGINFO,
5353
}
5454

5555
pub use self::Signal::*;
5656

57-
#[cfg(not(target_os = "macos"))]
57+
#[cfg(any(target_os = "linux", target_os = "android", target_os = "emscripten"))]
5858
const SIGNALS: [Signal; 31] = [
5959
SIGHUP,
6060
SIGINT,
@@ -87,7 +87,7 @@ const SIGNALS: [Signal; 31] = [
8787
SIGIO,
8888
SIGPWR,
8989
SIGSYS];
90-
#[cfg(target_os = "macos")]
90+
#[cfg(not(any(target_os = "linux", target_os = "android", target_os = "emscripten")))]
9191
const SIGNALS: [Signal; 31] = [
9292
SIGHUP,
9393
SIGINT,

0 commit comments

Comments
 (0)