Skip to content

Commit 9e9a325

Browse files
authored
Solaris: correct a number of types, add some errnos
1 parent 81310f5 commit 9e9a325

File tree

1 file changed

+84
-45
lines changed

1 file changed

+84
-45
lines changed

src/unix/solaris/mod.rs

Lines changed: 84 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -3,36 +3,36 @@ use dox::{mem, Option};
33
pub type c_char = i8;
44
pub type c_long = i64;
55
pub type c_ulong = u64;
6-
pub type clockid_t = ::c_int;
76

8-
pub type blkcnt_t = i64;
9-
pub type clock_t = i64;
10-
pub type daddr_t = i64;
11-
pub type dev_t = u64;
12-
pub type fsblkcnt_t = u64;
13-
pub type fsfilcnt_t = u64;
14-
pub type ino_t = i64;
15-
pub type key_t = i32;
16-
pub type major_t = u32;
17-
pub type minor_t = u32;
18-
pub type mode_t = u32;
19-
pub type nlink_t = u32;
20-
pub type rlim_t = u64;
21-
pub type speed_t = u32;
22-
pub type tcflag_t = u32;
23-
pub type time_t = i64;
24-
pub type wchar_t = i32;
7+
pub type clockid_t = ::c_int;
8+
pub type blkcnt_t = ::c_long;
9+
pub type clock_t = ::c_long;
10+
pub type daddr_t = ::c_long;
11+
pub type dev_t = ::c_ulong;
12+
pub type fsblkcnt_t = ::c_ulong;
13+
pub type fsfilcnt_t = ::c_ulong;
14+
pub type ino_t = ::c_ulong;
15+
pub type key_t = ::c_int;
16+
pub type major_t = ::c_uint;
17+
pub type minor_t = ::c_uint;
18+
pub type mode_t = ::c_uint;
19+
pub type nlink_t = ::c_uint;
20+
pub type rlim_t = ::c_ulong;
21+
pub type speed_t = ::c_uint;
22+
pub type tcflag_t = ::c_uint;
23+
pub type time_t = ::c_long;
24+
pub type wchar_t = ::c_int;
2525
pub type nfds_t = ::c_ulong;
2626

2727
pub type suseconds_t = ::c_long;
28-
pub type off_t = i64;
28+
pub type off_t = ::c_long;
2929
pub type useconds_t = ::c_uint;
30-
pub type socklen_t = u32;
30+
pub type socklen_t = ::c_uint;
3131
pub type sa_family_t = u16;
3232
pub type pthread_t = ::c_uint;
3333
pub type pthread_key_t = ::c_uint;
34-
pub type blksize_t = u32;
35-
pub type fflags_t = u32;
34+
pub type blksize_t = ::c_int;
35+
pub type fflags_t = ::c_int;
3636
pub type nl_item = ::c_int;
3737
pub type id_t = ::c_int;
3838
pub type idtype_t = ::c_uint;
@@ -617,7 +617,7 @@ pub const E2BIG: ::c_int = 7;
617617
pub const ENOEXEC: ::c_int = 8;
618618
pub const EBADF: ::c_int = 9;
619619
pub const ECHILD: ::c_int = 10;
620-
pub const EDEADLK: ::c_int = 45;
620+
pub const EAGAIN: ::c_int = 11;
621621
pub const ENOMEM: ::c_int = 12;
622622
pub const EACCES: ::c_int = 13;
623623
pub const EFAULT: ::c_int = 14;
@@ -641,11 +641,65 @@ pub const EMLINK: ::c_int = 31;
641641
pub const EPIPE: ::c_int = 32;
642642
pub const EDOM: ::c_int = 33;
643643
pub const ERANGE: ::c_int = 34;
644+
pub const ENOMSG: ::c_int = 35;
645+
pub const EIDRM: ::c_int = 36;
646+
pub const ECHRNG: ::c_int = 37;
647+
pub const EL2NSYNC: ::c_int = 38;
648+
pub const EL3HLT: ::c_int = 39;
649+
pub const EL3RST: ::c_int = 40;
650+
pub const ELNRNG: ::c_int = 41;
651+
pub const EUNATCH: ::c_int = 42;
652+
pub const ENOCSI: ::c_int = 43;
653+
pub const EL2HLT: ::c_int = 44;
654+
pub const EDEADLK: ::c_int = 45;
655+
pub const ENOLCK: ::c_int = 46;
656+
pub const ECANCELED: ::c_int = 47;
644657
pub const ENOTSUP: ::c_int = 48;
645-
pub const EAGAIN: ::c_int = 11;
646-
pub const EWOULDBLOCK: ::c_int = 11;
647-
pub const EINPROGRESS: ::c_int = 150;
648-
pub const EALREADY: ::c_int = 149;
658+
pub const EDQUOT: ::c_int = 49;
659+
pub const EBADE: ::c_int = 50;
660+
pub const EBADR: ::c_int = 51;
661+
pub const EXFULL: ::c_int = 52;
662+
pub const ENOANO: ::c_int = 53;
663+
pub const EBADRQC: ::c_int = 54;
664+
pub const EBADSLT: ::c_int = 55;
665+
pub const EDEADLOCK: ::c_int = 56;
666+
pub const EBFONT: ::c_int = 57;
667+
pub const EOWNERDEAD: ::c_int = 58;
668+
pub const ENOTRECOVERABLE: ::c_int = 59;
669+
pub const ENOSTR: ::c_int = 60;
670+
pub const ENODATA: ::c_int = 61;
671+
pub const ETIME: ::c_int = 62;
672+
pub const ENOSR: ::c_int = 63;
673+
pub const ENONET: ::c_int = 64;
674+
pub const ENOPKG: ::c_int = 65;
675+
pub const EREMOTE: ::c_int = 66;
676+
pub const ENOLINK: ::c_int = 67;
677+
pub const EADV: ::c_int = 68;
678+
pub const ESRMNT: ::c_int = 69;
679+
pub const ECOMM: ::c_int = 70;
680+
pub const EPROTO: ::c_int = 71;
681+
pub const ELOCKUNMAPPED: ::c_int = 72;
682+
pub const ENOTACTIVE: ::c_int = 73;
683+
pub const EMULTIHOP: ::c_int = 74;
684+
pub const EADI: ::c_int = 75;
685+
pub const EBADMSG: ::c_int = 77;
686+
pub const ENAMETOOLONG: ::c_int = 78;
687+
pub const EOVERFLOW: ::c_int = 79;
688+
pub const ENOTUNIQ: ::c_int = 80;
689+
pub const EBADFD: ::c_int = 81;
690+
pub const EREMCHG: ::c_int = 82;
691+
pub const ELIBACC: ::c_int = 83;
692+
pub const ELIBBAD: ::c_int = 84;
693+
pub const ELIBSCN: ::c_int = 85;
694+
pub const ELIBMAX: ::c_int = 86;
695+
pub const ELIBEXEC: ::c_int = 87;
696+
pub const EILSEQ: ::c_int = 88;
697+
pub const ENOSYS: ::c_int = 89;
698+
pub const ELOOP: ::c_int = 90;
699+
pub const ERESTART: ::c_int = 91;
700+
pub const ESTRPIPE: ::c_int = 92;
701+
pub const ENOTEMPTY: ::c_int = 93;
702+
pub const EUSERS: ::c_int = 94;
649703
pub const ENOTSOCK: ::c_int = 95;
650704
pub const EDESTADDRREQ: ::c_int = 96;
651705
pub const EMSGSIZE: ::c_int = 97;
@@ -670,26 +724,11 @@ pub const ESHUTDOWN: ::c_int = 143;
670724
pub const ETOOMANYREFS: ::c_int = 144;
671725
pub const ETIMEDOUT: ::c_int = 145;
672726
pub const ECONNREFUSED: ::c_int = 146;
673-
pub const ELOOP: ::c_int = 90;
674-
pub const ENAMETOOLONG: ::c_int = 78;
675727
pub const EHOSTDOWN: ::c_int = 147;
676728
pub const EHOSTUNREACH: ::c_int = 148;
677-
pub const ENOTEMPTY: ::c_int = 93;
678-
pub const EUSERS: ::c_int = 94;
679-
pub const EDQUOT: ::c_int = 49;
680-
pub const ESTALE: ::c_int = 151;
681-
pub const EREMOTE: ::c_int = 66;
682-
pub const ENOLCK: ::c_int = 46;
683-
pub const ENOSYS: ::c_int = 89;
684-
pub const EIDRM: ::c_int = 36;
685-
pub const ENOMSG: ::c_int = 35;
686-
pub const EOVERFLOW: ::c_int = 79;
687-
pub const ECANCELED: ::c_int = 47;
688-
pub const EILSEQ: ::c_int = 88;
689-
pub const EBADMSG: ::c_int = 77;
690-
pub const EMULTIHOP: ::c_int = 74;
691-
pub const ENOLINK: ::c_int = 67;
692-
pub const EPROTO: ::c_int = 71;
729+
pub const EWOULDBLOCK: ::c_int = EAGAIN;
730+
pub const EALREADY: ::c_int = 149;
731+
pub const EINPROGRESS: ::c_int = 150;
693732

694733
pub const EAI_SYSTEM: ::c_int = 11;
695734

0 commit comments

Comments
 (0)