Skip to content

Commit 5513040

Browse files
author
Dave Huseby
committed
fixing the macos defines...i picked the wrong one during a merge earlier.
1 parent 4aa499a commit 5513040

File tree

1 file changed

+115
-107
lines changed

1 file changed

+115
-107
lines changed

‎src/liblibc/lib.rs

+115-107
Original file line numberDiff line numberDiff line change
@@ -4373,11 +4373,14 @@ pub mod consts {
43734373
pub const MCL_CURRENT : c_int = 0x0001;
43744374
pub const MCL_FUTURE : c_int = 0x0002;
43754375

4376-
pub const MS_SYNC : c_int = 0x0002; // changed
43774376
pub const MS_ASYNC : c_int = 0x0001;
4378-
pub const MS_INVALIDATE : c_int = 0x0004; // changed
4377+
pub const MS_INVALIDATE : c_int = 0x0002;
4378+
pub const MS_SYNC : c_int = 0x0010;
4379+
4380+
pub const MS_KILLPAGES : c_int = 0x0004;
4381+
pub const MS_DEACTIVATE : c_int = 0x0008;
43794382

4380-
pub const EPERM : c_int = 1; // not checked
4383+
pub const EPERM : c_int = 1;
43814384
pub const ENOENT : c_int = 2;
43824385
pub const ESRCH : c_int = 3;
43834386
pub const EINTR : c_int = 4;
@@ -4412,7 +4415,7 @@ pub mod consts {
44124415
pub const EDOM : c_int = 33;
44134416
pub const ERANGE : c_int = 34;
44144417
pub const EAGAIN : c_int = 35;
4415-
pub const EWOULDBLOCK : c_int = 35;
4418+
pub const EWOULDBLOCK : c_int = EAGAIN;
44164419
pub const EINPROGRESS : c_int = 36;
44174420
pub const EALREADY : c_int = 37;
44184421
pub const ENOTSOCK : c_int = 38;
@@ -4422,7 +4425,7 @@ pub mod consts {
44224425
pub const ENOPROTOOPT : c_int = 42;
44234426
pub const EPROTONOSUPPORT : c_int = 43;
44244427
pub const ESOCKTNOSUPPORT : c_int = 44;
4425-
pub const EOPNOTSUPP : c_int = 45;
4428+
pub const ENOTSUP : c_int = 45;
44264429
pub const EPFNOSUPPORT : c_int = 46;
44274430
pub const EAFNOSUPPORT : c_int = 47;
44284431
pub const EADDRINUSE : c_int = 48;
@@ -4459,25 +4462,32 @@ pub mod consts {
44594462
pub const EFTYPE : c_int = 79;
44604463
pub const EAUTH : c_int = 80;
44614464
pub const ENEEDAUTH : c_int = 81;
4462-
pub const EIDRM : c_int = 82;
4463-
pub const ENOMSG : c_int = 83;
4465+
pub const EPWROFF : c_int = 82;
4466+
pub const EDEVERR : c_int = 83;
44644467
pub const EOVERFLOW : c_int = 84;
4465-
pub const ECANCELED : c_int = 85;
4466-
pub const EILSEQ : c_int = 86;
4467-
pub const ENOATTR : c_int = 87;
4468-
pub const EDOOFUS : c_int = 88;
4469-
pub const EBADMSG : c_int = 89;
4470-
pub const EMULTIHOP : c_int = 90;
4471-
pub const ENOLINK : c_int = 91;
4472-
pub const EPROTO : c_int = 92;
4473-
pub const ENOMEDIUM : c_int = 93;
4474-
pub const EUNUSED94 : c_int = 94;
4475-
pub const EUNUSED95 : c_int = 95;
4476-
pub const EUNUSED96 : c_int = 96;
4477-
pub const EUNUSED97 : c_int = 97;
4478-
pub const EUNUSED98 : c_int = 98;
4479-
pub const EASYNC : c_int = 99;
4480-
pub const ELAST : c_int = 99;
4468+
pub const EBADEXEC : c_int = 85;
4469+
pub const EBADARCH : c_int = 86;
4470+
pub const ESHLIBVERS : c_int = 87;
4471+
pub const EBADMACHO : c_int = 88;
4472+
pub const ECANCELED : c_int = 89;
4473+
pub const EIDRM : c_int = 90;
4474+
pub const ENOMSG : c_int = 91;
4475+
pub const EILSEQ : c_int = 92;
4476+
pub const ENOATTR : c_int = 93;
4477+
pub const EBADMSG : c_int = 94;
4478+
pub const EMULTIHOP : c_int = 95;
4479+
pub const ENODATA : c_int = 96;
4480+
pub const ENOLINK : c_int = 97;
4481+
pub const ENOSR : c_int = 98;
4482+
pub const ENOSTR : c_int = 99;
4483+
pub const EPROTO : c_int = 100;
4484+
pub const ETIME : c_int = 101;
4485+
pub const EOPNOTSUPP : c_int = 102;
4486+
pub const ENOPOLICY : c_int = 103;
4487+
pub const ENOTRECOVERABLE : c_int = 104;
4488+
pub const EOWNERDEAD : c_int = 105;
4489+
pub const EQFULL : c_int = 106;
4490+
pub const ELAST : c_int = 106;
44814491
}
44824492
pub mod posix01 {
44834493
use types::os::arch::c95::{c_int, size_t};
@@ -4498,7 +4508,7 @@ pub mod consts {
44984508
pub const GLOB_MARK : c_int = 0x0008;
44994509
pub const GLOB_NOCHECK : c_int = 0x0010;
45004510
pub const GLOB_NOSORT : c_int = 0x0020;
4501-
pub const GLOB_NOESCAPE : c_int = 0x1000; // changed
4511+
pub const GLOB_NOESCAPE : c_int = 0x2000;
45024512

45034513
pub const GLOB_NOSPACE : c_int = -1;
45044514
pub const GLOB_ABORTED : c_int = -2;
@@ -4510,41 +4520,38 @@ pub mod consts {
45104520
pub const POSIX_MADV_WILLNEED : c_int = 3;
45114521
pub const POSIX_MADV_DONTNEED : c_int = 4;
45124522

4513-
pub const _SC_IOV_MAX : c_int = 51; // all changed...
4514-
pub const _SC_GETGR_R_SIZE_MAX : c_int = 100;
4515-
pub const _SC_GETPW_R_SIZE_MAX : c_int = 101;
4516-
pub const _SC_LOGIN_NAME_MAX : c_int = 102;
4517-
pub const _SC_MQ_PRIO_MAX : c_int = 59;
4518-
pub const _SC_THREAD_ATTR_STACKADDR : c_int = 77;
4519-
pub const _SC_THREAD_ATTR_STACKSIZE : c_int = 78;
4520-
pub const _SC_THREAD_DESTRUCTOR_ITERATIONS : c_int = 80;
4521-
pub const _SC_THREAD_KEYS_MAX : c_int = 81;
4522-
pub const _SC_THREAD_PRIO_INHERIT : c_int = 82;
4523-
pub const _SC_THREAD_PRIO_PROTECT : c_int = 83;
4524-
pub const _SC_THREAD_PRIORITY_SCHEDULING : c_int = 84;
4525-
pub const _SC_THREAD_PROCESS_SHARED : c_int = 85;
4526-
pub const _SC_THREAD_SAFE_FUNCTIONS : c_int = 103;
4527-
pub const _SC_THREAD_STACK_MIN : c_int = 89;
4528-
pub const _SC_THREAD_THREADS_MAX : c_int = 90;
4529-
pub const _SC_THREADS : c_int = 91;
4530-
pub const _SC_TTY_NAME_MAX : c_int = 107;
4531-
pub const _SC_ATEXIT_MAX : c_int = 46;
4532-
pub const _SC_XOPEN_CRYPT : c_int = 117;
4533-
pub const _SC_XOPEN_ENH_I18N : c_int = 118;
4534-
pub const _SC_XOPEN_LEGACY : c_int = 119;
4535-
pub const _SC_XOPEN_REALTIME : c_int = 120;
4536-
pub const _SC_XOPEN_REALTIME_THREADS : c_int = 121;
4537-
pub const _SC_XOPEN_SHM : c_int = 30;
4538-
pub const _SC_XOPEN_UNIX : c_int = 123;
4539-
pub const _SC_XOPEN_VERSION : c_int = 125;
4540-
//pub const _SC_XOPEN_XCU_VERSION : c_int = ;
4541-
4542-
pub const PTHREAD_CREATE_JOINABLE: c_int = 0;
4543-
pub const PTHREAD_CREATE_DETACHED: c_int = 1;
4544-
pub const PTHREAD_STACK_MIN: size_t = 2048;
4523+
pub const _SC_IOV_MAX : c_int = 56;
4524+
pub const _SC_GETGR_R_SIZE_MAX : c_int = 70;
4525+
pub const _SC_GETPW_R_SIZE_MAX : c_int = 71;
4526+
pub const _SC_LOGIN_NAME_MAX : c_int = 73;
4527+
pub const _SC_MQ_PRIO_MAX : c_int = 75;
4528+
pub const _SC_THREAD_ATTR_STACKADDR : c_int = 82;
4529+
pub const _SC_THREAD_ATTR_STACKSIZE : c_int = 83;
4530+
pub const _SC_THREAD_DESTRUCTOR_ITERATIONS : c_int = 85;
4531+
pub const _SC_THREAD_KEYS_MAX : c_int = 86;
4532+
pub const _SC_THREAD_PRIO_INHERIT : c_int = 87;
4533+
pub const _SC_THREAD_PRIO_PROTECT : c_int = 88;
4534+
pub const _SC_THREAD_PRIORITY_SCHEDULING : c_int = 89;
4535+
pub const _SC_THREAD_PROCESS_SHARED : c_int = 90;
4536+
pub const _SC_THREAD_SAFE_FUNCTIONS : c_int = 91;
4537+
pub const _SC_THREAD_STACK_MIN : c_int = 93;
4538+
pub const _SC_THREAD_THREADS_MAX : c_int = 94;
4539+
pub const _SC_THREADS : c_int = 96;
4540+
pub const _SC_TTY_NAME_MAX : c_int = 101;
4541+
pub const _SC_ATEXIT_MAX : c_int = 107;
4542+
pub const _SC_XOPEN_CRYPT : c_int = 108;
4543+
pub const _SC_XOPEN_ENH_I18N : c_int = 109;
4544+
pub const _SC_XOPEN_LEGACY : c_int = 110;
4545+
pub const _SC_XOPEN_REALTIME : c_int = 111;
4546+
pub const _SC_XOPEN_REALTIME_THREADS : c_int = 112;
4547+
pub const _SC_XOPEN_SHM : c_int = 113;
4548+
pub const _SC_XOPEN_UNIX : c_int = 115;
4549+
pub const _SC_XOPEN_VERSION : c_int = 116;
4550+
pub const _SC_XOPEN_XCU_VERSION : c_int = 121;
45454551

4546-
pub const CLOCK_REALTIME: c_int = 0;
4547-
pub const CLOCK_MONOTONIC: c_int = 3;
4552+
pub const PTHREAD_CREATE_JOINABLE: c_int = 1;
4553+
pub const PTHREAD_CREATE_DETACHED: c_int = 2;
4554+
pub const PTHREAD_STACK_MIN: size_t = 8192;
45484555
}
45494556
pub mod posix08 {
45504557
}
@@ -4556,23 +4563,21 @@ pub mod consts {
45564563
pub const MADV_SEQUENTIAL : c_int = 2;
45574564
pub const MADV_WILLNEED : c_int = 3;
45584565
pub const MADV_DONTNEED : c_int = 4;
4559-
pub const MADV_FREE : c_int = 6; // changed
4560-
//pub const MADV_NOSYNC : c_int = ;
4561-
//pub const MADV_AUTOSYNC : c_int = ;
4562-
//pub const MADV_NOCORE : c_int = ;
4563-
//pub const MADV_CORE : c_int = ;
4564-
//pub const MADV_PROTECT : c_int = ;
4565-
4566-
//pub const MINCORE_INCORE : c_int = ;
4567-
//pub const MINCORE_REFERENCED : c_int = ;
4568-
//pub const MINCORE_MODIFIED : c_int = ;
4569-
//pub const MINCORE_REFERENCED_OTHER : c_int = ;
4570-
//pub const MINCORE_MODIFIED_OTHER : c_int = ;
4571-
//pub const MINCORE_SUPER : c_int = ;
4566+
pub const MADV_FREE : c_int = 5;
4567+
pub const MADV_ZERO_WIRED_PAGES : c_int = 6;
4568+
pub const MADV_FREE_REUSABLE : c_int = 7;
4569+
pub const MADV_FREE_REUSE : c_int = 8;
4570+
pub const MADV_CAN_REUSE : c_int = 9;
4571+
4572+
pub const MINCORE_INCORE : c_int = 0x1;
4573+
pub const MINCORE_REFERENCED : c_int = 0x2;
4574+
pub const MINCORE_MODIFIED : c_int = 0x4;
4575+
pub const MINCORE_REFERENCED_OTHER : c_int = 0x8;
4576+
pub const MINCORE_MODIFIED_OTHER : c_int = 0x10;
45724577

4573-
pub const AF_INET: c_int = 2;
4574-
pub const AF_INET6: c_int = 24; // changed
45754578
pub const AF_UNIX: c_int = 1;
4579+
pub const AF_INET: c_int = 2;
4580+
pub const AF_INET6: c_int = 30;
45764581
pub const SOCK_STREAM: c_int = 1;
45774582
pub const SOCK_DGRAM: c_int = 2;
45784583
pub const SOCK_RAW: c_int = 3;
@@ -4585,13 +4590,11 @@ pub mod consts {
45854590
pub const IP_HDRINCL: c_int = 2;
45864591
pub const IP_ADD_MEMBERSHIP: c_int = 12;
45874592
pub const IP_DROP_MEMBERSHIP: c_int = 13;
4588-
// don't exist, keep same as IP_ADD_MEMBERSHIP
45894593
pub const IPV6_ADD_MEMBERSHIP: c_int = 12;
4590-
// don't exist, keep same as IP_DROP_MEMBERSHIP
45914594
pub const IPV6_DROP_MEMBERSHIP: c_int = 13;
45924595

4593-
pub const TCP_NODELAY: c_int = 1;
4594-
//pub const TCP_KEEPIDLE: c_int = ;
4596+
pub const TCP_NODELAY: c_int = 0x01;
4597+
pub const TCP_KEEPALIVE: c_int = 0x10;
45954598
pub const SOL_SOCKET: c_int = 0xffff;
45964599
pub const SO_KEEPALIVE: c_int = 0x0008;
45974600
pub const SO_BROADCAST: c_int = 0x0020;
@@ -4607,18 +4610,19 @@ pub mod consts {
46074610
pub mod extra {
46084611
use types::os::arch::c95::c_int;
46094612

4613+
pub const O_DSYNC : c_int = 4194304;
46104614
pub const O_SYNC : c_int = 128;
46114615
pub const O_NONBLOCK : c_int = 4;
4612-
pub const CTL_KERN: c_int = 1;
4613-
pub const KERN_PROC: c_int = 66;
4616+
pub const F_FULLFSYNC : c_int = 51;
46144617

46154618
pub const MAP_COPY : c_int = 0x0002;
4616-
pub const MAP_RENAME : c_int = 0x0000; // changed
4617-
pub const MAP_NORESERVE : c_int = 0x0000; // changed
4618-
pub const MAP_HASSEMAPHORE : c_int = 0x0000; // changed
4619-
//pub const MAP_STACK : c_int = ;
4620-
//pub const MAP_NOSYNC : c_int = ;
4621-
//pub const MAP_NOCORE : c_int = ;
4619+
pub const MAP_RENAME : c_int = 0x0020;
4620+
pub const MAP_NORESERVE : c_int = 0x0040;
4621+
pub const MAP_NOEXTEND : c_int = 0x0100;
4622+
pub const MAP_HASSEMAPHORE : c_int = 0x0200;
4623+
pub const MAP_NOCACHE : c_int = 0x0400;
4624+
pub const MAP_JIT : c_int = 0x0800;
4625+
pub const MAP_STACK : c_int = 0;
46224626

46234627
pub const IPPROTO_RAW : c_int = 255;
46244628
}
@@ -4652,31 +4656,35 @@ pub mod consts {
46524656
pub const _SC_2_UPE : c_int = 25;
46534657
pub const _SC_STREAM_MAX : c_int = 26;
46544658
pub const _SC_TZNAME_MAX : c_int = 27;
4655-
pub const _SC_ASYNCHRONOUS_IO : c_int = 45; // changed...
4656-
pub const _SC_MAPPED_FILES : c_int = 53;
4657-
pub const _SC_MEMLOCK : c_int = 54;
4658-
pub const _SC_MEMLOCK_RANGE : c_int = 55;
4659-
pub const _SC_MEMORY_PROTECTION : c_int = 56;
4660-
pub const _SC_MESSAGE_PASSING : c_int = 57;
4661-
pub const _SC_PRIORITIZED_IO : c_int = 60;
4662-
pub const _SC_PRIORITY_SCHEDULING : c_int = 61;
4663-
pub const _SC_REALTIME_SIGNALS : c_int = 64;
4664-
pub const _SC_SEMAPHORES : c_int = 67;
4665-
pub const _SC_FSYNC : c_int = 29;
4666-
pub const _SC_SHARED_MEMORY_OBJECTS : c_int = 68;
4667-
pub const _SC_SYNCHRONIZED_IO : c_int = 75;
4668-
pub const _SC_TIMERS : c_int = 94; // ...changed
4659+
pub const _SC_ASYNCHRONOUS_IO : c_int = 28;
4660+
pub const _SC_PAGESIZE : c_int = 29;
4661+
pub const _SC_MEMLOCK : c_int = 30;
4662+
pub const _SC_MEMLOCK_RANGE : c_int = 31;
4663+
pub const _SC_MEMORY_PROTECTION : c_int = 32;
4664+
pub const _SC_MESSAGE_PASSING : c_int = 33;
4665+
pub const _SC_PRIORITIZED_IO : c_int = 34;
4666+
pub const _SC_PRIORITY_SCHEDULING : c_int = 35;
4667+
pub const _SC_REALTIME_SIGNALS : c_int = 36;
4668+
pub const _SC_SEMAPHORES : c_int = 37;
4669+
pub const _SC_FSYNC : c_int = 38;
4670+
pub const _SC_SHARED_MEMORY_OBJECTS : c_int = 39;
4671+
pub const _SC_SYNCHRONIZED_IO : c_int = 40;
4672+
pub const _SC_TIMERS : c_int = 41;
46694673
pub const _SC_AIO_LISTIO_MAX : c_int = 42;
46704674
pub const _SC_AIO_MAX : c_int = 43;
46714675
pub const _SC_AIO_PRIO_DELTA_MAX : c_int = 44;
4672-
pub const _SC_DELAYTIMER_MAX : c_int = 50; // changed...
4673-
pub const _SC_MQ_OPEN_MAX : c_int = 58;
4674-
pub const _SC_PAGESIZE : c_int = 28;
4675-
pub const _SC_RTSIG_MAX : c_int = 66;
4676-
pub const _SC_SEM_NSEMS_MAX : c_int = 31;
4677-
pub const _SC_SEM_VALUE_MAX : c_int = 32;
4678-
pub const _SC_SIGQUEUE_MAX : c_int = 70;
4679-
pub const _SC_TIMER_MAX : c_int = 93;
4676+
pub const _SC_DELAYTIMER_MAX : c_int = 45;
4677+
pub const _SC_MQ_OPEN_MAX : c_int = 46;
4678+
pub const _SC_MAPPED_FILES : c_int = 47;
4679+
pub const _SC_RTSIG_MAX : c_int = 48;
4680+
pub const _SC_SEM_NSEMS_MAX : c_int = 49;
4681+
pub const _SC_SEM_VALUE_MAX : c_int = 50;
4682+
pub const _SC_SIGQUEUE_MAX : c_int = 51;
4683+
pub const _SC_TIMER_MAX : c_int = 52;
4684+
pub const _SC_XBS5_ILP32_OFF32 : c_int = 122;
4685+
pub const _SC_XBS5_ILP32_OFFBIG : c_int = 123;
4686+
pub const _SC_XBS5_LP64_OFF64 : c_int = 124;
4687+
pub const _SC_XBS5_LPBIG_OFFBIG : c_int = 125;
46804688
}
46814689
}
46824690
}

0 commit comments

Comments
 (0)