diff --git a/libc-test/build.rs b/libc-test/build.rs index 252d5206f3896..531b51f60cc4a 100644 --- a/libc-test/build.rs +++ b/libc-test/build.rs @@ -13,7 +13,7 @@ fn src_hotfix_dir() -> PathBuf { fn do_cc() { let target = env::var("TARGET").unwrap(); - if cfg!(unix) { + if cfg!(unix) || target.contains("cygwin") { let exclude = ["redox", "wasi", "wali"]; if !exclude.iter().any(|x| target.contains(x)) { let mut cmsg = cc::Build::new(); @@ -656,6 +656,7 @@ fn test_cygwin(target: &str) { "dlfcn.h", "errno.h", "fcntl.h", + "fnmatch.h", "grp.h", "iconv.h", "langinfo.h", @@ -666,11 +667,13 @@ fn test_cygwin(target: &str) { "netinet/tcp.h", "poll.h", "pthread.h", + "pty.h", "pwd.h", "resolv.h", "sched.h", "semaphore.h", "signal.h", + "spawn.h", "stddef.h", "stdlib.h", "string.h", @@ -690,6 +693,7 @@ fn test_cygwin(target: &str) { "sys/uio.h", "sys/un.h", "sys/utsname.h", + "sys/vfs.h", "syslog.h", "termios.h", "unistd.h", @@ -809,7 +813,7 @@ fn test_cygwin(target: &str) { } }); - cfg.generate("../src/lib.rs", "main.rs"); + cfg.generate(src_hotfix_dir().join("lib.rs"), "main.rs"); } fn test_windows(target: &str) { diff --git a/libc-test/semver/cygwin.txt b/libc-test/semver/cygwin.txt index 0c953574c0ad6..2b0b827674fdf 100644 --- a/libc-test/semver/cygwin.txt +++ b/libc-test/semver/cygwin.txt @@ -1,5 +1,262 @@ +AF_APPLETALK +AF_CCITT +AF_CHAOS +AF_DATAKIT +AF_DECnet +AF_DLI +AF_ECMA +AF_HYLINK +AF_IMPLINK +AF_ISO +AF_LAT +AF_LOCAL +AF_NETBIOS +AF_NS +AF_OSI +AF_PUP +AF_SNA +AI_ADDRCONFIG +AI_ALL +AI_CANONNAME +AI_NUMERICHOST +AI_NUMERICSERV +AI_PASSIVE +AI_V4MAPPED +ARG_MAX +AT_EACCESS +AT_EMPTY_PATH +AT_FDCWD +AT_REMOVEDIR +AT_SYMLINK_FOLLOW +AT_SYMLINK_NOFOLLOW +B1000000 +B1152000 +B1500000 +B2000000 +B2500000 +B3000000 +B460800 +B500000 +B576000 +B921600 +BIG_ENDIAN +BS0 +BS1 +BSDLY +BUFSIZ +BUS_ADRALN +BUS_ADRERR +BUS_OBJERR +CBAUD +CBAUDEX +CHILD_MAX +CLD_CONTINUED +CLD_DUMPED +CLD_EXITED +CLD_KILLED +CLD_STOPPED +CLD_TRAPPED +CLOCK_BOOTTIME +CLOCK_BOOTTIME_ALARM +CLOCK_MONOTONIC_COARSE +CLOCK_MONOTONIC_RAW +CLOCK_PROCESS_CPUTIME_ID +CLOCK_REALTIME_ALARM +CLOCK_REALTIME_COARSE +CLOCK_THREAD_CPUTIME_ID +CMSPAR +CPU_SETSIZE +CR0 +CR1 +CR2 +CR3 +CRDLY +CRTSCTS +EADV +EAI_AGAIN +EAI_BADFLAGS +EAI_FAIL +EAI_FAMILY +EAI_MEMORY +EAI_NODATA +EAI_NONAME +EAI_OVERFLOW +EAI_SERVICE +EAI_SOCKTYPE +EBADE +EBADFD +EBADR +EBADRQC +EBADSLT +EBFONT +ECHOCTL +ECHOKE +ECHRNG +ECOMM +EDEADLOCK +EDOTDOT +EFTYPE +EL2HLT +EL2NSYNC +EL3HLT +EL3RST +ELIBACC +ELIBBAD +ELIBEXEC +ELIBMAX +ELIBSCN +ELNRNG +EMULTIHOP +ENOANO +ENOCSI +ENODATA +ENOLINK +ENOMEDIUM +ENONET +ENOPKG +ENOSR +ENOSTR +ENOTRECOVERABLE +ENOTSUP +ENOTUNIQ +EOWNERDEAD +EPROCLIM +EREMCHG +EREMOTE +ESOCKTNOSUPPORT +ESRMNT +ESTRPIPE +ETIME +ETOOMANYREFS +EUNATCH +EUSERS +EXFULL +FALLOC_FL_COLLAPSE_RANGE +FALLOC_FL_INSERT_RANGE +FALLOC_FL_KEEP_SIZE +FALLOC_FL_PUNCH_HOLE +FALLOC_FL_UNSHARE_RANGE +FALLOC_FL_ZERO_RANGE +FF0 +FF1 +FFDLY +FIOASYNC +FIONREAD +FLUSHO FORK_NO_RELOAD FORK_RELOAD +F_CNVT +F_GETOWN +F_LOCK +F_RDLCK +F_RGETLK +F_RSETLK +F_RSETLKW +F_SETOWN +F_TEST +F_TLOCK +F_ULOCK +F_UNLCK +F_WRLCK +GRND_NONBLOCK +GRND_RANDOM +IFF_BROADCAST +IFF_DORMANT +IFF_LOOPBACK +IFF_LOWER_UP +IFF_MULTICAST +IFF_NOARP +IFF_NOTRAILERS +IFF_POINTOPOINT +IFF_PROMISC +IFF_RUNNING +IFF_UP +IMAXBEL +IOV_MAX +IPPROTO_AH +IPPROTO_DSTOPTS +IPPROTO_EGP +IPPROTO_ESP +IPPROTO_FRAGMENT +IPPROTO_HOPOPTS +IPPROTO_IDP +IPPROTO_IGMP +IPPROTO_IPIP +IPPROTO_MAX +IPPROTO_NONE +IPPROTO_PUP +IPPROTO_RAW +IPPROTO_ROUTING +IPTOS_LOWDELAY +IPTOS_RELIABILITY +IPTOS_THROUGHPUT +IPV6_ADD_MEMBERSHIP +IPV6_CHECKSUM +IPV6_DONTFRAG +IPV6_DROP_MEMBERSHIP +IPV6_HOPLIMIT +IPV6_HOPOPTS +IPV6_JOIN_GROUP +IPV6_LEAVE_GROUP +IPV6_PKTINFO +IPV6_RECVRTHDR +IPV6_RECVTCLASS +IPV6_RTHDR +IPV6_TCLASS +IPV6_UNICAST_IF +IP_ADD_SOURCE_MEMBERSHIP +IP_BLOCK_SOURCE +IP_DEFAULT_MULTICAST_LOOP +IP_DEFAULT_MULTICAST_TTL +IP_DROP_SOURCE_MEMBERSHIP +IP_HDRINCL +IP_OPTIONS +IP_PKTINFO +IP_TOS +IP_UNBLOCK_SOURCE +IP_UNICAST_IF +ITIMER_PROF +ITIMER_REAL +ITIMER_VIRTUAL +IUCLC +IUTF8 +LC_ALL +LC_ALL_MASK +LC_COLLATE +LC_COLLATE_MASK +LC_CTYPE +LC_CTYPE_MASK +LC_GLOBAL_LOCALE +LC_MESSAGES +LC_MESSAGES_MASK +LC_MONETARY +LC_MONETARY_MASK +LC_NUMERIC +LC_NUMERIC_MASK +LC_TIME +LC_TIME_MASK +LITTLE_ENDIAN +LOCK_EX +LOCK_NB +LOCK_SH +LOCK_UN +MADV_DONTNEED +MADV_NORMAL +MADV_RANDOM +MADV_SEQUENTIAL +MADV_WILLNEED +MAP_FILE +MAP_NORESERVE +MAP_TYPE +MCAST_BLOCK_SOURCE +MCAST_EXCLUDE +MCAST_INCLUDE +MCAST_JOIN_GROUP +MCAST_JOIN_SOURCE_GROUP +MCAST_LEAVE_GROUP +MCAST_LEAVE_SOURCE_GROUP +MCAST_UNBLOCK_SOURCE +MINSIGSTKSZ MOUNT_AUTOMATIC MOUNT_BIND MOUNT_CYGDRIVE @@ -20,8 +277,602 @@ MOUNT_SPARSE MOUNT_SYSTEM MOUNT_TEXT MOUNT_USER_TEMP +MSG_BCAST +MSG_CMSG_CLOEXEC +MSG_DONTWAIT +MSG_MCAST +NGROUPS_MAX +NI_DGRAM +NI_MAXSERV +NI_NAMEREQD +NI_NOFQDN +NI_NUMERICHOST +NI_NUMERICSERV +NL0 +NL1 +NLDLY +OFDEL +OFILL +OLCUC +O_DIRECT +O_DSYNC +O_EXEC +O_NOATIME +O_NOCTTY +O_PATH +O_RSYNC +O_SEARCH +O_SYNC +O_TMPFILE +PF_APPLETALK +PF_CCITT +PF_CHAOS +PF_DATAKIT +PF_DECnet +PF_DLI +PF_HYLINK +PF_IMPLINK +PF_ISO +PF_LAT +PF_LOCAL +PF_NETBIOS +PF_NS +PF_OSI +PF_PUP +PF_SNA +PIPE_BUF +POLLRDBAND +POLLRDNORM +POLLWRBAND +POLLWRNORM +POSIX_FADV_DONTNEED +POSIX_FADV_NOREUSE +POSIX_FADV_NORMAL +POSIX_FADV_RANDOM +POSIX_FADV_SEQUENTIAL +POSIX_FADV_WILLNEED +POSIX_MADV_DONTNEED +POSIX_MADV_NORMAL +POSIX_MADV_RANDOM +POSIX_MADV_SEQUENTIAL +POSIX_MADV_WILLNEED +POSIX_SPAWN_RESETIDS +POSIX_SPAWN_SETPGROUP +POSIX_SPAWN_SETSCHEDPARAM +POSIX_SPAWN_SETSCHEDULER +POSIX_SPAWN_SETSIGDEF +POSIX_SPAWN_SETSIGMASK +PTHREAD_CREATE_DETACHED +PTHREAD_CREATE_JOINABLE +PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP +PTHREAD_MUTEX_DEFAULT +PTHREAD_MUTEX_ERRORCHECK +PTHREAD_PROCESS_PRIVATE +PTHREAD_PROCESS_SHARED +PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP +PTHREAD_STACK_MIN +RLIMIT_AS +RLIMIT_CORE +RLIMIT_CPU +RLIMIT_DATA +RLIMIT_FSIZE +RLIMIT_NLIMITS +RLIMIT_NOFILE +RLIMIT_STACK +RLIM_INFINITY +RLIM_NLIMITS +RLIM_SAVED_CUR +RLIM_SAVED_MAX +RTLD_DEEPBIND +RTLD_NODELETE +RTLD_NOLOAD +RUSAGE_CHILDREN +RUSAGE_SELF +SCHED_FIFO +SCHED_OTHER +SCHED_RR +SCM_CREDENTIALS +SCM_RIGHTS +SEM_FAILED +SIGEMT +SIGEV_NONE +SIGEV_SIGNAL +SIGEV_THREAD +SIGPOLL +SIGPWR +SIGSTKSZ +SIOCGIFADDR +SIOCGIFBRDADDR +SIOCGIFCONF +SIOCGIFDSTADDR +SIOCGIFFLAGS +SIOCGIFHWADDR +SIOCGIFINDEX +SIOCGIFMETRIC +SIOCGIFMTU +SIOCGIFNETMASK +SIOGIFINDEX +SOCK_CLOEXEC +SOCK_NONBLOCK +SOCK_RAW +SOCK_RDM +SOL_IP +SOL_IPV6 +SOL_TCP +SOL_UDP +SOMAXCONN +SO_PASSCRED +SO_PEERCRED +SO_USELOOPBACK +SS_DISABLE +SS_ONSTACK +ST_NOSUID +ST_RDONLY +S_BLKSIZE +S_ENFMT +S_IEXEC +S_IREAD +S_IWRITE +TAB0 +TAB1 +TAB2 +TAB3 +TABDLY +TCFLSH +TCGETA +TCP_FASTOPEN +TCP_KEEPCNT +TCP_KEEPIDLE +TCP_KEEPINTVL +TCP_MAXSEG +TCP_QUICKACK +TCP_USER_TIMEOUT +TCSETA +TCSETAF +TCSETAW +TIMER_ABSTIME +TIOCCBRK +TIOCGPGRP +TIOCINQ +TIOCLINUX +TIOCMBIC +TIOCMBIS +TIOCMGET +TIOCMSET +TIOCM_CAR +TIOCM_CD +TIOCM_CTS +TIOCM_DTR +TIOCM_RI +TIOCM_RNG +TIOCM_RTS +TIOCPKT +TIOCPKT_DATA +TIOCPKT_DOSTOP +TIOCPKT_FLUSHREAD +TIOCPKT_FLUSHWRITE +TIOCPKT_NOSTOP +TIOCPKT_START +TIOCPKT_STOP +TIOCSBRK +TIOCSCTTY +TIOCSPGRP +UTIME_NOW +UTIME_OMIT +VDISCARD +VLNEXT +VREPRINT +VSWTC +VT0 +VT1 +VTDLY WINDOWS_HWND WINDOWS_POST WINDOWS_SEND +XTABS +_CS_PATH +_IONBF +_PC_2_SYMLINKS +_PC_ALLOC_SIZE_MIN +_PC_ASYNC_IO +_PC_FILESIZEBITS +_PC_PRIO_IO +_PC_REC_INCR_XFER_SIZE +_PC_REC_MAX_XFER_SIZE +_PC_REC_MIN_XFER_SIZE +_PC_REC_XFER_ALIGN +_PC_SYMLINK_MAX +_PC_SYNC_IO +_PC_TIMESTAMP_RESOLUTION +_POSIX_VDISABLE +_SC_2_CHAR_TERM +_SC_2_C_BIND +_SC_2_C_DEV +_SC_2_FORT_DEV +_SC_2_FORT_RUN +_SC_2_LOCALEDEF +_SC_2_PBS +_SC_2_PBS_ACCOUNTING +_SC_2_PBS_CHECKPOINT +_SC_2_PBS_LOCATE +_SC_2_PBS_MESSAGE +_SC_2_PBS_TRACK +_SC_2_SW_DEV +_SC_2_UPE +_SC_2_VERSION +_SC_ADVISORY_INFO +_SC_AIO_LISTIO_MAX +_SC_AIO_MAX +_SC_AIO_PRIO_DELTA_MAX +_SC_ASYNCHRONOUS_IO +_SC_ATEXIT_MAX +_SC_AVPHYS_PAGES +_SC_BARRIERS +_SC_BC_BASE_MAX +_SC_BC_DIM_MAX +_SC_BC_SCALE_MAX +_SC_BC_STRING_MAX +_SC_CLOCK_SELECTION +_SC_COLL_WEIGHTS_MAX +_SC_CPUTIME +_SC_DELAYTIMER_MAX +_SC_EXPR_NEST_MAX +_SC_FSYNC +_SC_GETGR_R_SIZE_MAX +_SC_GETPW_R_SIZE_MAX +_SC_IOV_MAX +_SC_IPV6 +_SC_JOB_CONTROL +_SC_LEVEL1_DCACHE_ASSOC +_SC_LEVEL1_DCACHE_LINESIZE +_SC_LEVEL1_DCACHE_SIZE +_SC_LEVEL1_ICACHE_ASSOC +_SC_LEVEL1_ICACHE_LINESIZE +_SC_LEVEL1_ICACHE_SIZE +_SC_LEVEL2_CACHE_ASSOC +_SC_LEVEL2_CACHE_LINESIZE +_SC_LEVEL2_CACHE_SIZE +_SC_LEVEL3_CACHE_ASSOC +_SC_LEVEL3_CACHE_LINESIZE +_SC_LEVEL3_CACHE_SIZE +_SC_LEVEL4_CACHE_ASSOC +_SC_LEVEL4_CACHE_LINESIZE +_SC_LEVEL4_CACHE_SIZE +_SC_LINE_MAX +_SC_LOGIN_NAME_MAX +_SC_MAPPED_FILES +_SC_MEMLOCK +_SC_MEMLOCK_RANGE +_SC_MEMORY_PROTECTION +_SC_MESSAGE_PASSING +_SC_MONOTONIC_CLOCK +_SC_MQ_OPEN_MAX +_SC_MQ_PRIO_MAX +_SC_NPROCESSORS_CONF +_SC_NPROCESSORS_ONLN +_SC_PHYS_PAGES +_SC_PRIORITIZED_IO +_SC_PRIORITY_SCHEDULING +_SC_RAW_SOCKETS +_SC_READER_WRITER_LOCKS +_SC_REALTIME_SIGNALS +_SC_REGEXP +_SC_RE_DUP_MAX +_SC_RTSIG_MAX +_SC_SAVED_IDS +_SC_SEMAPHORES +_SC_SEM_NSEMS_MAX +_SC_SEM_VALUE_MAX +_SC_SHARED_MEMORY_OBJECTS +_SC_SHELL +_SC_SIGQUEUE_MAX +_SC_SPAWN +_SC_SPIN_LOCKS +_SC_SPORADIC_SERVER +_SC_SS_REPL_MAX +_SC_SYNCHRONIZED_IO +_SC_THREADS +_SC_THREAD_ATTR_STACKADDR +_SC_THREAD_ATTR_STACKSIZE +_SC_THREAD_CPUTIME +_SC_THREAD_DESTRUCTOR_ITERATIONS +_SC_THREAD_KEYS_MAX +_SC_THREAD_PRIORITY_SCHEDULING +_SC_THREAD_PRIO_CEILING +_SC_THREAD_PRIO_INHERIT +_SC_THREAD_PRIO_PROTECT +_SC_THREAD_PROCESS_SHARED +_SC_THREAD_ROBUST_PRIO_INHERIT +_SC_THREAD_ROBUST_PRIO_PROTECT +_SC_THREAD_SAFE_FUNCTIONS +_SC_THREAD_SPORADIC_SERVER +_SC_THREAD_STACK_MIN +_SC_THREAD_THREADS_MAX +_SC_TIMEOUTS +_SC_TIMERS +_SC_TIMER_MAX +_SC_TRACE +_SC_TRACE_EVENT_FILTER +_SC_TRACE_EVENT_NAME_MAX +_SC_TRACE_INHERIT +_SC_TRACE_LOG +_SC_TRACE_NAME_MAX +_SC_TRACE_SYS_MAX +_SC_TRACE_USER_EVENT_MAX +_SC_TYPED_MEMORY_OBJECTS +_SC_V6_ILP32_OFF32 +_SC_V6_ILP32_OFFBIG +_SC_V6_LP64_OFF64 +_SC_V6_LPBIG_OFFBIG +_SC_V7_ILP32_OFF32 +_SC_V7_ILP32_OFFBIG +_SC_V7_LP64_OFF64 +_SC_V7_LPBIG_OFFBIG +_SC_XBS5_ILP32_OFF32 +_SC_XBS5_ILP32_OFFBIG +_SC_XBS5_LP64_OFF64 +_SC_XBS5_LPBIG_OFFBIG +_SC_XOPEN_CRYPT +_SC_XOPEN_ENH_I18N +_SC_XOPEN_LEGACY +_SC_XOPEN_REALTIME +_SC_XOPEN_REALTIME_THREADS +_SC_XOPEN_SHM +_SC_XOPEN_STREAMS +_SC_XOPEN_UNIX +_SC_XOPEN_UUCP +_SC_XOPEN_VERSION +__errno +_fpstate +_off64_t +_uc_fpxreg +_uc_xmmreg +abs +accept4 +arc4random +arc4random_buf +arc4random_uniform +asctime_r +basename +bintime +caddr_t +clearenv +clock_getres +clock_settime +cmsghdr +cpu_set_t +ctime_r cygwin_umount +daemon +dirfd dlfork +drand48 +dup3 +duplocale +eaccess +endpwent +erand48 +euidaccess +execvpe +explicit_bzero +faccessat +fallocate +fd_mask +fdatasync +fexecve +ffs +ffsl +ffsll +fls +flsl +flsll +forkpty +freelocale +fstatfs +futimes +futimesat +getdomainname +getdtablesize +getentropy +getgrgid_r +getgrnam_r +getgrouplist +gethostid +getitimer +getloadavg +getnameinfo +getpagesize +getpeereid +getpriority +getpt +getpwent +getpwnam_r +getpwuid_r +getrandom +getrlimit +iconv_t +id_t +if_freenameindex +if_nameindex +ifconf +ifreq +in6_pktinfo +in_pktinfo +initgroups +ip_mreq_source +itimerspec +jrand48 +key_t +labs +lcong48 +loff_t +lrand48 +lutimes +madvise +major +makedev +max_align_t +mcontext_t +memalign +memmem +memrchr +minor +mkfifoat +mknodat +mkostemp +mkostemps +mkstemps +mount +mrand48 +msghdr +newlocale +nl_item +nrand48 +openpty +pipe2 +posix_fadvise +posix_fallocate +posix_madvise +posix_spawn +posix_spawn_file_actions_addclose +posix_spawn_file_actions_adddup2 +posix_spawn_file_actions_addopen +posix_spawn_file_actions_destroy +posix_spawn_file_actions_init +posix_spawn_file_actions_t +posix_spawnattr_destroy +posix_spawnattr_getflags +posix_spawnattr_getpgroup +posix_spawnattr_getschedparam +posix_spawnattr_getschedpolicy +posix_spawnattr_getsigdefault +posix_spawnattr_getsigmask +posix_spawnattr_init +posix_spawnattr_setflags +posix_spawnattr_setpgroup +posix_spawnattr_setschedparam +posix_spawnattr_setschedpolicy +posix_spawnattr_setsigdefault +posix_spawnattr_setsigmask +posix_spawnattr_t +posix_spawnp +ppoll +pthread_atfork +pthread_attr_getguardsize +pthread_attr_getschedparam +pthread_attr_getstack +pthread_attr_setschedparam +pthread_barrier_destroy +pthread_barrier_init +pthread_barrier_t +pthread_barrier_wait +pthread_barrierattr_destroy +pthread_barrierattr_getpshared +pthread_barrierattr_init +pthread_barrierattr_t +pthread_cancel +pthread_condattr_getclock +pthread_condattr_getpshared +pthread_condattr_setclock +pthread_condattr_setpshared +pthread_getaffinity_np +pthread_getattr_np +pthread_getcpuclockid +pthread_getname_np +pthread_getschedparam +pthread_kill +pthread_mutex_timedlock +pthread_mutexattr_getprotocol +pthread_mutexattr_getpshared +pthread_mutexattr_setprotocol +pthread_mutexattr_setpshared +pthread_rwlockattr_getpshared +pthread_rwlockattr_setpshared +pthread_setaffinity_np +pthread_setname_np +pthread_setschedparam +pthread_setschedprio +pthread_sigmask +pthread_sigqueue +pthread_spin_destroy +pthread_spin_init +pthread_spin_lock +pthread_spin_trylock +pthread_spin_unlock +pthread_spinlock_t +ptsname_r +qsort_r +rand +reallocarray +reallocf +recvmsg +register_t +sbrk +sched_get_priority_max +sched_get_priority_min +sched_getaffinity +sched_getcpu +sched_getparam +sched_getscheduler +sched_param +sched_rr_get_interval +sched_setaffinity +sched_setparam +sched_setscheduler +seed48 +seekdir +sem +sem_close +sem_destroy +sem_getvalue +sem_init +sem_open +sem_timedwait +sem_unlink +sendmsg +setgroups +sethostname +setitimer +setpriority +setpwent +setrlimit +settimeofday +sigaltstack +sigevent +siginfo_t +sigsuspend +sigtimedwait +sigwait +sigwaitinfo +srand +srand48 +stack_t +statfs +strcasecmp_l +strftime +strncasecmp_l +strptime +strsep +sync +telldir +timer_create +timer_delete +timer_getoverrun +timer_gettime +timer_settime +timer_t +timingsafe_bcmp +timingsafe_memcmp +u_char +u_int +u_long +u_short +ucontext_t +ucred +umount +useconds_t +uselocale +utimensat +vhangup +vm_offset_t +vm_size_t diff --git a/libc-test/test/makedev.rs b/libc-test/test/makedev.rs index 374294ebe11d6..61e1d501be280 100644 --- a/libc-test/test/makedev.rs +++ b/libc-test/test/makedev.rs @@ -16,6 +16,7 @@ mod ret { target_os = "nto", target_os = "hurd", target_os = "openbsd", + target_os = "cygwin", ))] mod ret { pub type MajorRetType = libc::c_uint; diff --git a/src/unix/cygwin/mod.rs b/src/unix/cygwin/mod.rs index 312324a5e80fd..8719843b719f3 100644 --- a/src/unix/cygwin/mod.rs +++ b/src/unix/cygwin/mod.rs @@ -511,7 +511,7 @@ s_no_extra_traits! { } pub struct utsname { - pub sysname: [c_char; 65], + pub sysname: [c_char; 66], pub nodename: [c_char; 65], pub release: [c_char; 65], pub version: [c_char; 65], @@ -1892,14 +1892,6 @@ f! { set1.bits == set2.bits } - pub fn major(dev: dev_t) -> c_uint { - ((dev >> 16) & 0xffff) as c_uint - } - - pub fn minor(dev: dev_t) -> c_uint { - (dev & 0xffff) as c_uint - } - pub fn CMSG_LEN(length: c_uint) -> c_uint { CMSG_ALIGN(::core::mem::size_of::()) as c_uint + length } @@ -1938,6 +1930,14 @@ safe_f! { (ma << 16) | (mi & 0xffff) } + pub {const} fn major(dev: dev_t) -> c_uint { + ((dev >> 16) & 0xffff) as c_uint + } + + pub {const} fn minor(dev: dev_t) -> c_uint { + (dev & 0xffff) as c_uint + } + pub {const} fn WIFEXITED(status: c_int) -> bool { (status & 0xff) == 0 } @@ -2184,8 +2184,6 @@ extern "C" { pub fn timingsafe_bcmp(a: *const c_void, b: *const c_void, len: size_t) -> c_int; pub fn timingsafe_memcmp(a: *const c_void, b: *const c_void, len: size_t) -> c_int; - pub fn memccpy(dest: *mut c_void, src: *const c_void, c: c_int, count: size_t) -> *mut c_void; - pub fn memmem( haystack: *const c_void, haystacklen: size_t, @@ -2205,17 +2203,16 @@ extern "C" { pub fn dup3(src: c_int, dst: c_int, flags: c_int) -> c_int; pub fn eaccess(pathname: *const c_char, mode: c_int) -> c_int; pub fn euidaccess(pathname: *const c_char, mode: c_int) -> c_int; - // pub fn execlpe(path: *const c_char, arg0: *const c_char, ...) -> c_int; pub fn execvpe( file: *const c_char, - argv: *const *const c_char, - envp: *const *const c_char, + argv: *const *mut c_char, + envp: *const *mut c_char, ) -> c_int; pub fn faccessat(dirfd: c_int, pathname: *const c_char, mode: c_int, flags: c_int) -> c_int; - pub fn fexecve(fd: c_int, argv: *const *const c_char, envp: *const *const c_char) -> c_int; + pub fn fexecve(fd: c_int, argv: *const *mut c_char, envp: *const *mut c_char) -> c_int; pub fn fdatasync(fd: c_int) -> c_int; pub fn getdomainname(name: *mut c_char, len: size_t) -> c_int; @@ -2376,7 +2373,7 @@ extern "C" { ) -> c_int; pub fn pthread_setname_np(thread: pthread_t, name: *const c_char) -> c_int; - pub fn pthread_sigqueue(thread: *mut pthread_t, sig: c_int, value: sigval) -> c_int; + pub fn pthread_sigqueue(thread: pthread_t, sig: c_int, value: sigval) -> c_int; pub fn ioctl(fd: c_int, request: c_int, ...) -> c_int; diff --git a/src/unix/mod.rs b/src/unix/mod.rs index 2db79f5ac00cb..3bda08cabbb96 100644 --- a/src/unix/mod.rs +++ b/src/unix/mod.rs @@ -351,6 +351,7 @@ cfg_if! { target_os = "freebsd", target_os = "android", target_os = "openbsd", + target_os = "cygwin", ))] { pub const FNM_PATHNAME: c_int = 1 << 1; pub const FNM_NOESCAPE: c_int = 1 << 0;