Skip to content

Commit 9cf7c6a

Browse files
committed
Auto merge of #2030 - tamird:fuchsia-sockcloexec, r=JohnTitor
Correctly define SOCK_CLOEXEC on Fuchsia https://cs.opensource.google/fuchsia/fuchsia/+/master:zircon/third_party/ulib/musl/include/sys/socket.h;l=60-63;drc=7c5e521391fddb98fd8f6970da7c410899ddf5cf cc `@cramertj`
2 parents db03632 + b24d958 commit 9cf7c6a

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

src/fuchsia/mod.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -1461,8 +1461,6 @@ pub const O_RDONLY: ::c_int = 0;
14611461
pub const O_WRONLY: ::c_int = 1;
14621462
pub const O_RDWR: ::c_int = 2;
14631463

1464-
pub const SOCK_CLOEXEC: ::c_int = O_CLOEXEC;
1465-
14661464
pub const S_IFIFO: ::mode_t = 4096;
14671465
pub const S_IFCHR: ::mode_t = 8192;
14681466
pub const S_IFBLK: ::mode_t = 24576;
@@ -2908,7 +2906,8 @@ pub const O_SYNC: ::c_int = 0x00000040 | O_DSYNC;
29082906
pub const O_RSYNC: ::c_int = O_SYNC;
29092907
pub const O_DSYNC: ::c_int = 0x00000020;
29102908

2911-
pub const SOCK_NONBLOCK: ::c_int = 2048;
2909+
pub const SOCK_CLOEXEC: ::c_int = 0o2000000;
2910+
pub const SOCK_NONBLOCK: ::c_int = 0o4000;
29122911

29132912
pub const MAP_ANON: ::c_int = 0x0020;
29142913
pub const MAP_GROWSDOWN: ::c_int = 0x0100;

0 commit comments

Comments
 (0)