openbsd port

- remove multiple definition of stack_t
- make types resolv correctly
- correct target definitions
  - dragonfly is already defined as freebsdlike
  - bitrig is an openbsdlike
- imports should be public

4 files changed, 442 insertions, 448 deletions

diff --git a/src/unix/bsd/mod.rs b/src/unix/bsd/mod.rs
index 03fe18c2ea..62444f6215 100644
--- a/src/unix/bsd/mod.rs
+++ b/src/unix/bsd/mod.rs
@@ -149,7 +149,7 @@ cfg_if! {
         mod apple;
         pub use self::apple::*;
     } else if #[cfg(any(target_os = "openbsd", target_os = "netbsd",
-                        target_os = "dragonfly"))] {
+                        target_os = "bitrig"))] {
         mod openbsdlike;
         pub use self::openbsdlike::*;
     } else if #[cfg(any(target_os = "freebsd", target_os = "dragonfly"))] {
diff --git a/src/unix/bsd/openbsdlike/bitrig.rs b/src/unix/bsd/openbsdlike/bitrig.rs
index 9039ff446c..b29a78f19e 100644
--- a/src/unix/bsd/openbsdlike/bitrig.rs
+++ b/src/unix/bsd/openbsdlike/bitrig.rs
@@ -1,16 +1,16 @@
 s! {
     pub struct glob_t {
-        pub gl_pathc:  c_int,
-        pub gl_matchc: c_int,
-        pub gl_offs:   c_int,
-        pub gl_flags:  c_int,
-        pub gl_pathv:  *mut *mut c_char,
-        __unused1: *mut c_void,
-        __unused2: *mut c_void,
-        __unused3: *mut c_void,
-        __unused4: *mut c_void,
-        __unused5: *mut c_void,
-        __unused6: *mut c_void,
-        __unused7: *mut c_void,
+        pub gl_pathc:  ::c_int,
+        pub gl_matchc: ::c_int,
+        pub gl_offs:   ::c_int,
+        pub gl_flags:  ::c_int,
+        pub gl_pathv:  *mut *mut ::c_char,
+        __unused1: *mut ::c_void,
+        __unused2: *mut ::c_void,
+        __unused3: *mut ::c_void,
+        __unused4: *mut ::c_void,
+        __unused5: *mut ::c_void,
+        __unused6: *mut ::c_void,
+        __unused7: *mut ::c_void,
     }
 }
diff --git a/src/unix/bsd/openbsdlike/mod.rs b/src/unix/bsd/openbsdlike/mod.rs
index b21f851c76..ea4b99ce6f 100644
--- a/src/unix/bsd/openbsdlike/mod.rs
+++ b/src/unix/bsd/openbsdlike/mod.rs
@@ -5,11 +5,11 @@ pub type time_t = i64;
 pub type suseconds_t = i64;
 pub type dev_t = i32;
 pub type mode_t = u32;
-pub type nlink_t = uint32_t;
-pub type blksize_t = uint32_t;
-pub type ino_t = uint64_t;
+pub type nlink_t = ::uint32_t;
+pub type blksize_t = ::uint32_t;
+pub type ino_t = ::uint64_t;
 pub type fflags_t = u32;
-pub type pthread_attr_t = *mut c_void;
+pub type pthread_attr_t = *mut ::c_void;
 pub type sigset_t = ::c_uint;
 pub type pthread_key_t = ::c_int;
 pub type pthread_mutex_t = *mut ::c_void;
@@ -40,8 +40,8 @@ s! {
     }
 
     pub struct sigaction {
-        pub sa_sigaction: sighandler_t,
-        pub sa_mask: sigset_t,
+        pub sa_sigaction: ::sighandler_t,
+        pub sa_mask: ::sigset_t,
         pub sa_flags: ::c_int,
     }
 
@@ -53,76 +53,70 @@ s! {
 
     pub struct sockaddr_storage {
         pub ss_len: u8,
-        pub ss_family: sa_family_t,
+        pub ss_family: ::sa_family_t,
         __ss_pad1: [u8; 6],
         __ss_pad2: i64,
         __ss_pad3: [u8; 240],
     }
 
     pub struct addrinfo {
-        pub ai_flags: c_int,
-        pub ai_family: c_int,
-        pub ai_socktype: c_int,
-        pub ai_protocol: c_int,
-        pub ai_addrlen: socklen_t,
-        pub ai_addr: *mut sockaddr,
-        pub ai_canonname: *mut c_char,
-        pub ai_next: *mut addrinfo,
+        pub ai_flags: ::c_int,
+        pub ai_family: ::c_int,
+        pub ai_socktype: ::c_int,
+        pub ai_protocol: ::c_int,
+        pub ai_addrlen: ::socklen_t,
+        pub ai_addr: *mut ::sockaddr,
+        pub ai_canonname: *mut ::c_char,
+        pub ai_next: *mut ::addrinfo,
     }
 
     pub struct stat {
-        pub st_mode: mode_t,
-        pub st_dev: dev_t,
-        pub st_ino: ino_t,
-        pub st_nlink: nlink_t,
-        pub st_uid: uid_t,
-        pub st_gid: gid_t,
-        pub st_rdev: dev_t,
-        pub st_atime: time_t,
-        pub st_atime_nsec: c_long,
-        pub st_mtime: time_t,
-        pub st_mtime_nsec: c_long,
-        pub st_ctime: time_t,
-        pub st_ctime_nsec: c_long,
-        pub st_size: off_t,
-        pub st_blocks: blkcnt_t,
-        pub st_blksize: blksize_t,
-        pub st_flags: fflags_t,
-        pub st_gen: uint32_t,
-        pub st_birthtime: time_t,
-        pub st_birthtime_nsec: c_long,
-    }
-
-    pub struct stack_t {
-        pub ss_sp: *mut ::c_void,
-        pub ss_size: ::size_t,
-        pub ss_flags: ::c_int,
+        pub st_mode: ::mode_t,
+        pub st_dev: ::dev_t,
+        pub st_ino: ::ino_t,
+        pub st_nlink: ::nlink_t,
+        pub st_uid: ::uid_t,
+        pub st_gid: ::gid_t,
+        pub st_rdev: ::dev_t,
+        pub st_atime: ::time_t,
+        pub st_atime_nsec: ::c_long,
+        pub st_mtime: ::time_t,
+        pub st_mtime_nsec: ::c_long,
+        pub st_ctime: ::time_t,
+        pub st_ctime_nsec: ::c_long,
+        pub st_size: ::off_t,
+        pub st_blocks: ::blkcnt_t,
+        pub st_blksize: ::blksize_t,
+        pub st_flags: ::fflags_t,
+        pub st_gen: ::uint32_t,
+        pub st_birthtime: ::time_t,
+        pub st_birthtime_nsec: ::c_long,
     }
 }
 
-pub const EXIT_FAILURE : c_int = 1;
-pub const EXIT_SUCCESS : c_int = 0;
-pub const RAND_MAX : c_int = 2147483647;
-pub const EOF : c_int = -1;
-pub const SEEK_SET : c_int = 0;
-pub const SEEK_CUR : c_int = 1;
-pub const SEEK_END : c_int = 2;
-pub const _IOFBF : c_int = 0;
-pub const _IONBF : c_int = 2;
-pub const _IOLBF : c_int = 1;
-pub const BUFSIZ : c_uint = 1024;
-pub const FOPEN_MAX : c_uint = 20;
-pub const FILENAME_MAX : c_uint = 1024;
-pub const L_tmpnam : c_uint = 1024;
-pub const TMP_MAX : c_uint = 308915776;
-pub const O_RDONLY : c_int = 0;
-pub const O_WRONLY : c_int = 1;
-pub const O_RDWR : c_int = 2;
-pub const O_APPEND : c_int = 8;
-pub const O_CREAT : c_int = 512;
-pub const O_EXCL : c_int = 2048;
-pub const O_NOCTTY : c_int = 32768;
-pub const O_TRUNC : c_int = 1024;
+pub const EXIT_FAILURE : ::c_int = 1;
+pub const EXIT_SUCCESS : ::c_int = 0;
+pub const RAND_MAX : ::c_int = 2147483647;
+pub const EOF : ::c_int = -1;
+pub const SEEK_SET : ::c_int = 0;
+pub const SEEK_CUR : ::c_int = 1;
+pub const SEEK_END : ::c_int = 2;
+pub const _IOFBF : ::c_int = 0;
+pub const _IONBF : ::c_int = 2;
+pub const _IOLBF : ::c_int = 1;
+pub const BUFSIZ : ::c_uint = 1024;
+pub const FOPEN_MAX : ::c_uint = 20;
+pub const FILENAME_MAX : ::c_uint = 1024;
+pub const L_tmpnam : ::c_uint = 1024;
+pub const TMP_MAX : ::c_uint = 308915776;
+pub const O_RDONLY : ::c_int = 0;
+pub const O_WRONLY : ::c_int = 1;
+pub const O_RDWR : ::c_int = 2;
+pub const O_APPEND : ::c_int = 8;
+pub const O_CREAT : ::c_int = 512;
+pub const O_EXCL : ::c_int = 2048;
+pub const O_NOCTTY : ::c_int = 32768;
+pub const O_TRUNC : ::c_int = 1024;
 pub const O_CLOEXEC: ::c_int = 0x10000;
 pub const S_IFIFO : mode_t = 4096;
 pub const S_IFCHR : mode_t = 8192;
@@ -147,355 +141,355 @@ pub const S_IRWXO : mode_t = 7;
 pub const S_IXOTH : mode_t = 1;
 pub const S_IWOTH : mode_t = 2;
 pub const S_IROTH : mode_t = 4;
-pub const F_OK : c_int = 0;
-pub const R_OK : c_int = 4;
-pub const W_OK : c_int = 2;
-pub const X_OK : c_int = 1;
-pub const STDIN_FILENO : c_int = 0;
-pub const STDOUT_FILENO : c_int = 1;
-pub const STDERR_FILENO : c_int = 2;
-pub const F_LOCK : c_int = 1;
-pub const F_TEST : c_int = 3;
-pub const F_TLOCK : c_int = 2;
-pub const F_ULOCK : c_int = 0;
-pub const SIGHUP : c_int = 1;
-pub const SIGINT : c_int = 2;
-pub const SIGQUIT : c_int = 3;
-pub const SIGILL : c_int = 4;
-pub const SIGABRT : c_int = 6;
-pub const SIGFPE : c_int = 8;
-pub const SIGKILL : c_int = 9;
-pub const SIGSEGV : c_int = 11;
-pub const SIGPIPE : c_int = 13;
-pub const SIGALRM : c_int = 14;
-pub const SIGTERM : c_int = 15;
-
-pub const PROT_NONE : c_int = 0;
-pub const PROT_READ : c_int = 1;
-pub const PROT_WRITE : c_int = 2;
-pub const PROT_EXEC : c_int = 4;
-
-pub const MAP_FILE : c_int = 0x0000;
-pub const MAP_SHARED : c_int = 0x0001;
-pub const MAP_PRIVATE : c_int = 0x0002;
-pub const MAP_FIXED : c_int = 0x0010;
-pub const MAP_ANON : c_int = 0x1000;
-
-pub const MAP_FAILED : *mut c_void = !0 as *mut c_void;
-
-pub const MCL_CURRENT : c_int = 0x0001;
-pub const MCL_FUTURE : c_int = 0x0002;
-
-pub const MS_ASYNC : c_int = 0x0001;
-pub const MS_SYNC : c_int = 0x0002;
-pub const MS_INVALIDATE : c_int = 0x0004;
-
-pub const EPERM : c_int = 1;
-pub const ENOENT : c_int = 2;
-pub const ESRCH : c_int = 3;
-pub const EINTR : c_int = 4;
-pub const EIO : c_int = 5;
-pub const ENXIO : c_int = 6;
-pub const E2BIG : c_int = 7;
-pub const ENOEXEC : c_int = 8;
-pub const EBADF : c_int = 9;
-pub const ECHILD : c_int = 10;
-pub const EDEADLK : c_int = 11;
-pub const ENOMEM : c_int = 12;
-pub const EACCES : c_int = 13;
-pub const EFAULT : c_int = 14;
-pub const ENOTBLK : c_int = 15;
-pub const EBUSY : c_int = 16;
-pub const EEXIST : c_int = 17;
-pub const EXDEV : c_int = 18;
-pub const ENODEV : c_int = 19;
-pub const ENOTDIR : c_int = 20;
-pub const EISDIR : c_int = 21;
-pub const EINVAL : c_int = 22;
-pub const ENFILE : c_int = 23;
-pub const EMFILE : c_int = 24;
-pub const ENOTTY : c_int = 25;
-pub const ETXTBSY : c_int = 26;
-pub const EFBIG : c_int = 27;
-pub const ENOSPC : c_int = 28;
-pub const ESPIPE : c_int = 29;
-pub const EROFS : c_int = 30;
-pub const EMLINK : c_int = 31;
-pub const EPIPE : c_int = 32;
-pub const EDOM : c_int = 33;
-pub const ERANGE : c_int = 34;
-pub const EAGAIN : c_int = 35;
-pub const EWOULDBLOCK : c_int = 35;
-pub const EINPROGRESS : c_int = 36;
-pub const EALREADY : c_int = 37;
-pub const ENOTSOCK : c_int = 38;
-pub const EDESTADDRREQ : c_int = 39;
-pub const EMSGSIZE : c_int = 40;
-pub const EPROTOTYPE : c_int = 41;
-pub const ENOPROTOOPT : c_int = 42;
-pub const EPROTONOSUPPORT : c_int = 43;
-pub const ESOCKTNOSUPPORT : c_int = 44;
-pub const EOPNOTSUPP : c_int = 45;
-pub const EPFNOSUPPORT : c_int = 46;
-pub const EAFNOSUPPORT : c_int = 47;
-pub const EADDRINUSE : c_int = 48;
-pub const EADDRNOTAVAIL : c_int = 49;
-pub const ENETDOWN : c_int = 50;
-pub const ENETUNREACH : c_int = 51;
-pub const ENETRESET : c_int = 52;
-pub const ECONNABORTED : c_int = 53;
-pub const ECONNRESET : c_int = 54;
-pub const ENOBUFS : c_int = 55;
-pub const EISCONN : c_int = 56;
-pub const ENOTCONN : c_int = 57;
-pub const ESHUTDOWN : c_int = 58;
-pub const ETOOMANYREFS : c_int = 59;
-pub const ETIMEDOUT : c_int = 60;
-pub const ECONNREFUSED : c_int = 61;
-pub const ELOOP : c_int = 62;
-pub const ENAMETOOLONG : c_int = 63;
-pub const EHOSTDOWN : c_int = 64;
-pub const EHOSTUNREACH : c_int = 65;
-pub const ENOTEMPTY : c_int = 66;
-pub const EPROCLIM : c_int = 67;
-pub const EUSERS : c_int = 68;
-pub const EDQUOT : c_int = 69;
-pub const ESTALE : c_int = 70;
-pub const EREMOTE : c_int = 71;
-pub const EBADRPC : c_int = 72;
-pub const ERPCMISMATCH : c_int = 73;
-pub const EPROGUNAVAIL : c_int = 74;
-pub const EPROGMISMATCH : c_int = 75;
-pub const EPROCUNAVAIL : c_int = 76;
-pub const ENOLCK : c_int = 77;
-pub const ENOSYS : c_int = 78;
-pub const EFTYPE : c_int = 79;
-pub const EAUTH : c_int = 80;
-pub const ENEEDAUTH : c_int = 81;
-pub const EIPSEC : c_int = 82;
-pub const ENOATTR : c_int = 83;
-pub const EILSEQ : c_int = 84;
-pub const ENOMEDIUM : c_int = 85;
-pub const EMEDIUMTYPE : c_int = 86;
-pub const EOVERFLOW : c_int = 87;
-pub const ECANCELED : c_int = 88;
-pub const EIDRM : c_int = 89;
-pub const ENOMSG : c_int = 90;
-pub const ENOTSUP : c_int = 91;
-pub const ELAST : c_int = 91; // must be equal to largest errno
-
-pub const F_DUPFD : c_int = 0;
-pub const F_GETFD : c_int = 1;
-pub const F_SETFD : c_int = 2;
-pub const F_GETFL : c_int = 3;
-pub const F_SETFL : c_int = 4;
-pub const F_GETOWN : c_int = 5;
-pub const F_SETOWN : c_int = 6;
-pub const F_GETLK : c_int = 7;
-pub const F_SETLK : c_int = 8;
-pub const F_SETLKW : c_int = 9;
-pub const F_DUPFD_CLOEXEC : c_int = 10;
-
-pub const SIGTRAP : c_int = 5;
-
-pub const GLOB_APPEND   : c_int = 0x0001;
-pub const GLOB_DOOFFS   : c_int = 0x0002;
-pub const GLOB_ERR      : c_int = 0x0004;
-pub const GLOB_MARK     : c_int = 0x0008;
-pub const GLOB_NOCHECK  : c_int = 0x0010;
-pub const GLOB_NOSORT   : c_int = 0x0020;
-pub const GLOB_NOESCAPE : c_int = 0x1000;
-
-pub const GLOB_NOSPACE  : c_int = -1;
-pub const GLOB_ABORTED  : c_int = -2;
-pub const GLOB_NOMATCH  : c_int = -3;
-pub const GLOB_NOSYS : c_int = -4;
-
-pub const POSIX_MADV_NORMAL : c_int = 0;
-pub const POSIX_MADV_RANDOM : c_int = 1;
-pub const POSIX_MADV_SEQUENTIAL : c_int = 2;
-pub const POSIX_MADV_WILLNEED : c_int = 3;
-pub const POSIX_MADV_DONTNEED : c_int = 4;
-
-pub const _SC_IOV_MAX : c_int = 51;
-pub const _SC_GETGR_R_SIZE_MAX : c_int = 100;
-pub const _SC_GETPW_R_SIZE_MAX : c_int = 101;
-pub const _SC_LOGIN_NAME_MAX : c_int = 102;
-pub const _SC_MQ_PRIO_MAX : c_int = 59;
-pub const _SC_THREAD_ATTR_STACKADDR : c_int = 77;
-pub const _SC_THREAD_ATTR_STACKSIZE : c_int = 78;
-pub const _SC_THREAD_DESTRUCTOR_ITERATIONS : c_int = 80;
-pub const _SC_THREAD_KEYS_MAX : c_int = 81;
-pub const _SC_THREAD_PRIO_INHERIT : c_int = 82;
-pub const _SC_THREAD_PRIO_PROTECT : c_int = 83;
-pub const _SC_THREAD_PRIORITY_SCHEDULING : c_int = 84;
-pub const _SC_THREAD_PROCESS_SHARED : c_int = 85;
-pub const _SC_THREAD_SAFE_FUNCTIONS : c_int = 103;
-pub const _SC_THREAD_STACK_MIN : c_int = 89;
-pub const _SC_THREAD_THREADS_MAX : c_int = 90;
-pub const _SC_THREADS : c_int = 91;
-pub const _SC_TTY_NAME_MAX : c_int = 107;
-pub const _SC_ATEXIT_MAX : c_int = 46;
-pub const _SC_XOPEN_CRYPT : c_int = 117;
-pub const _SC_XOPEN_ENH_I18N : c_int = 118;
-pub const _SC_XOPEN_LEGACY : c_int = 119;
-pub const _SC_XOPEN_REALTIME : c_int = 120;
-pub const _SC_XOPEN_REALTIME_THREADS : c_int = 121;
-pub const _SC_XOPEN_SHM : c_int = 30;
-pub const _SC_XOPEN_UNIX : c_int = 123;
-pub const _SC_XOPEN_VERSION : c_int = 125;
-
-pub const PTHREAD_CREATE_JOINABLE : c_int = 0;
-pub const PTHREAD_CREATE_DETACHED : c_int = 1;
-pub const PTHREAD_STACK_MIN : size_t = 2048;
-
-pub const CLOCK_REALTIME : c_int = 0;
-pub const CLOCK_MONOTONIC : c_int = 3;
-
-pub const RLIMIT_CPU: c_int = 0;
-pub const RLIMIT_FSIZE: c_int = 1;
-pub const RLIMIT_DATA: c_int = 2;
-pub const RLIMIT_STACK: c_int = 3;
-pub const RLIMIT_CORE: c_int = 4;
-pub const RLIMIT_RSS: c_int = 5;
-pub const RLIMIT_MEMLOCK: c_int = 6;
-pub const RLIMIT_NPROC: c_int = 7;
-pub const RLIMIT_NOFILE: c_int = 8;
-pub const RLIM_NLIMITS: c_int = 9;
+pub const F_OK : ::c_int = 0;
+pub const R_OK : ::c_int = 4;
+pub const W_OK : ::c_int = 2;
+pub const X_OK : ::c_int = 1;
+pub const STDIN_FILENO : ::c_int = 0;
+pub const STDOUT_FILENO : ::c_int = 1;
+pub const STDERR_FILENO : ::c_int = 2;
+pub const F_LOCK : ::c_int = 1;
+pub const F_TEST : ::c_int = 3;
+pub const F_TLOCK : ::c_int = 2;
+pub const F_ULOCK : ::c_int = 0;
+pub const SIGHUP : ::c_int = 1;
+pub const SIGINT : ::c_int = 2;
+pub const SIGQUIT : ::c_int = 3;
+pub const SIGILL : ::c_int = 4;
+pub const SIGABRT : ::c_int = 6;
+pub const SIGFPE : ::c_int = 8;
+pub const SIGKILL : ::c_int = 9;
+pub const SIGSEGV : ::c_int = 11;
+pub const SIGPIPE : ::c_int = 13;
+pub const SIGALRM : ::c_int = 14;
+pub const SIGTERM : ::c_int = 15;
+
+pub const PROT_NONE : ::c_int = 0;
+pub const PROT_READ : ::c_int = 1;
+pub const PROT_WRITE : ::c_int = 2;
+pub const PROT_EXEC : ::c_int = 4;
+
+pub const MAP_FILE : ::c_int = 0x0000;
+pub const MAP_SHARED : ::c_int = 0x0001;
+pub const MAP_PRIVATE : ::c_int = 0x0002;
+pub const MAP_FIXED : ::c_int = 0x0010;
+pub const MAP_ANON : ::c_int = 0x1000;
+
+pub const MAP_FAILED : *mut ::c_void = !0 as *mut ::c_void;
+
+pub const MCL_CURRENT : ::c_int = 0x0001;
+pub const MCL_FUTURE : ::c_int = 0x0002;
+
+pub const MS_ASYNC : ::c_int = 0x0001;
+pub const MS_SYNC : ::c_int = 0x0002;
+pub const MS_INVALIDATE : ::c_int = 0x0004;
+
+pub const EPERM : ::c_int = 1;
+pub const ENOENT : ::c_int = 2;
+pub const ESRCH : ::c_int = 3;
+pub const EINTR : ::c_int = 4;
+pub const EIO : ::c_int = 5;
+pub const ENXIO : ::c_int = 6;
+pub const E2BIG : ::c_int = 7;
+pub const ENOEXEC : ::c_int = 8;
+pub const EBADF : ::c_int = 9;
+pub const ECHILD : ::c_int = 10;
+pub const EDEADLK : ::c_int = 11;
+pub const ENOMEM : ::c_int = 12;
+pub const EACCES : ::c_int = 13;
+pub const EFAULT : ::c_int = 14;
+pub const ENOTBLK : ::c_int = 15;
+pub const EBUSY : ::c_int = 16;
+pub const EEXIST : ::c_int = 17;
+pub const EXDEV : ::c_int = 18;
+pub const ENODEV : ::c_int = 19;
+pub const ENOTDIR : ::c_int = 20;
+pub const EISDIR : ::c_int = 21;
+pub const EINVAL : ::c_int = 22;
+pub const ENFILE : ::c_int = 23;
+pub const EMFILE : ::c_int = 24;
+pub const ENOTTY : ::c_int = 25;
+pub const ETXTBSY : ::c_int = 26;
+pub const EFBIG : ::c_int = 27;
+pub const ENOSPC : ::c_int = 28;
+pub const ESPIPE : ::c_int = 29;
+pub const EROFS : ::c_int = 30;
+pub const EMLINK : ::c_int = 31;
+pub const EPIPE : ::c_int = 32;
+pub const EDOM : ::c_int = 33;
+pub const ERANGE : ::c_int = 34;
+pub const EAGAIN : ::c_int = 35;
+pub const EWOULDBLOCK : ::c_int = 35;
+pub const EINPROGRESS : ::c_int = 36;
+pub const EALREADY : ::c_int = 37;
+pub const ENOTSOCK : ::c_int = 38;
+pub const EDESTADDRREQ : ::c_int = 39;
+pub const EMSGSIZE : ::c_int = 40;
+pub const EPROTOTYPE : ::c_int = 41;
+pub const ENOPROTOOPT : ::c_int = 42;
+pub const EPROTONOSUPPORT : ::c_int = 43;
+pub const ESOCKTNOSUPPORT : ::c_int = 44;
+pub const EOPNOTSUPP : ::c_int = 45;
+pub const EPFNOSUPPORT : ::c_int = 46;
+pub const EAFNOSUPPORT : ::c_int = 47;
+pub const EADDRINUSE : ::c_int = 48;
+pub const EADDRNOTAVAIL : ::c_int = 49;
+pub const ENETDOWN : ::c_int = 50;
+pub const ENETUNREACH : ::c_int = 51;
+pub const ENETRESET : ::c_int = 52;
+pub const ECONNABORTED : ::c_int = 53;
+pub const ECONNRESET : ::c_int = 54;
+pub const ENOBUFS : ::c_int = 55;
+pub const EISCONN : ::c_int = 56;
+pub const ENOTCONN : ::c_int = 57;
+pub const ESHUTDOWN : ::c_int = 58;
+pub const ETOOMANYREFS : ::c_int = 59;
+pub const ETIMEDOUT : ::c_int = 60;
+pub const ECONNREFUSED : ::c_int = 61;
+pub const ELOOP : ::c_int = 62;
+pub const ENAMETOOLONG : ::c_int = 63;
+pub const EHOSTDOWN : ::c_int = 64;
+pub const EHOSTUNREACH : ::c_int = 65;
+pub const ENOTEMPTY : ::c_int = 66;
+pub const EPROCLIM : ::c_int = 67;
+pub const EUSERS : ::c_int = 68;
+pub const EDQUOT : ::c_int = 69;
+pub const ESTALE : ::c_int = 70;
+pub const EREMOTE : ::c_int = 71;
+pub const EBADRPC : ::c_int = 72;
+pub const ERPCMISMATCH : ::c_int = 73;
+pub const EPROGUNAVAIL : ::c_int = 74;
+pub const EPROGMISMATCH : ::c_int = 75;
+pub const EPROCUNAVAIL : ::c_int = 76;
+pub const ENOLCK : ::c_int = 77;
+pub const ENOSYS : ::c_int = 78;
+pub const EFTYPE : ::c_int = 79;
+pub const EAUTH : ::c_int = 80;
+pub const ENEEDAUTH : ::c_int = 81;
+pub const EIPSEC : ::c_int = 82;
+pub const ENOATTR : ::c_int = 83;
+pub const EILSEQ : ::c_int = 84;
+pub const ENOMEDIUM : ::c_int = 85;
+pub const EMEDIUMTYPE : ::c_int = 86;
+pub const EOVERFLOW : ::c_int = 87;
+pub const ECANCELED : ::c_int = 88;
+pub const EIDRM : ::c_int = 89;
+pub const ENOMSG : ::c_int = 90;
+pub const ENOTSUP : ::c_int = 91;
+pub const ELAST : ::c_int = 91; // must be equal to largest errno
+
+pub const F_DUPFD : ::c_int = 0;
+pub const F_GETFD : ::c_int = 1;
+pub const F_SETFD : ::c_int = 2;
+pub const F_GETFL : ::c_int = 3;
+pub const F_SETFL : ::c_int = 4;
+pub const F_GETOWN : ::c_int = 5;
+pub const F_SETOWN : ::c_int = 6;
+pub const F_GETLK : ::c_int = 7;
+pub const F_SETLK : ::c_int = 8;
+pub const F_SETLKW : ::c_int = 9;
+pub const F_DUPFD_CLOEXEC : ::c_int = 10;
+
+pub const SIGTRAP : ::c_int = 5;
+
+pub const GLOB_APPEND   : ::c_int = 0x0001;
+pub const GLOB_DOOFFS   : ::c_int = 0x0002;
+pub const GLOB_ERR      : ::c_int = 0x0004;
+pub const GLOB_MARK     : ::c_int = 0x0008;
+pub const GLOB_NOCHECK  : ::c_int = 0x0010;
+pub const GLOB_NOSORT   : ::c_int = 0x0020;
+pub const GLOB_NOESCAPE : ::c_int = 0x1000;
+
+pub const GLOB_NOSPACE  : ::c_int = -1;
+pub const GLOB_ABORTED  : ::c_int = -2;
+pub const GLOB_NOMATCH  : ::c_int = -3;
+pub const GLOB_NOSYS : ::c_int = -4;
+
+pub const POSIX_MADV_NORMAL : ::c_int = 0;
+pub const POSIX_MADV_RANDOM : ::c_int = 1;
+pub const POSIX_MADV_SEQUENTIAL : ::c_int = 2;
+pub const POSIX_MADV_WILLNEED : ::c_int = 3;
+pub const POSIX_MADV_DONTNEED : ::c_int = 4;
+
+pub const _SC_IOV_MAX : ::c_int = 51;
+pub const _SC_GETGR_R_SIZE_MAX : ::c_int = 100;
+pub const _SC_GETPW_R_SIZE_MAX : ::c_int = 101;
+pub const _SC_LOGIN_NAME_MAX : ::c_int = 102;
+pub const _SC_MQ_PRIO_MAX : ::c_int = 59;
+pub const _SC_THREAD_ATTR_STACKADDR : ::c_int = 77;
+pub const _SC_THREAD_ATTR_STACKSIZE : ::c_int = 78;
+pub const _SC_THREAD_DESTRUCTOR_ITERATIONS : ::c_int = 80;
+pub const _SC_THREAD_KEYS_MAX : ::c_int = 81;
+pub const _SC_THREAD_PRIO_INHERIT : ::c_int = 82;
+pub const _SC_THREAD_PRIO_PROTECT : ::c_int = 83;
+pub const _SC_THREAD_PRIORITY_SCHEDULING : ::c_int = 84;
+pub const _SC_THREAD_PROCESS_SHARED : ::c_int = 85;
+pub const _SC_THREAD_SAFE_FUNCTIONS : ::c_int = 103;
+pub const _SC_THREAD_STACK_MIN : ::c_int = 89;
+pub const _SC_THREAD_THREADS_MAX : ::c_int = 90;
+pub const _SC_THREADS : ::c_int = 91;
+pub const _SC_TTY_NAME_MAX : ::c_int = 107;
+pub const _SC_ATEXIT_MAX : ::c_int = 46;
+pub const _SC_XOPEN_CRYPT : ::c_int = 117;
+pub const _SC_XOPEN_ENH_I18N : ::c_int = 118;
+pub const _SC_XOPEN_LEGACY : ::c_int = 119;
+pub const _SC_XOPEN_REALTIME : ::c_int = 120;
+pub const _SC_XOPEN_REALTIME_THREADS : ::c_int = 121;
+pub const _SC_XOPEN_SHM : ::c_int = 30;
+pub const _SC_XOPEN_UNIX : ::c_int = 123;
+pub const _SC_XOPEN_VERSION : ::c_int = 125;
+
+pub const PTHREAD_CREATE_JOINABLE : ::c_int = 0;
+pub const PTHREAD_CREATE_DETACHED : ::c_int = 1;
+pub const PTHREAD_STACK_MIN : ::size_t = 2048;
+
+pub const CLOCK_REALTIME : ::c_int = 0;
+pub const CLOCK_MONOTONIC : ::c_int = 3;
+
+pub const RLIMIT_CPU: ::c_int = 0;
+pub const RLIMIT_FSIZE: ::c_int = 1;
+pub const RLIMIT_DATA: ::c_int = 2;
+pub const RLIMIT_STACK: ::c_int = 3;
+pub const RLIMIT_CORE: ::c_int = 4;
+pub const RLIMIT_RSS: ::c_int = 5;
+pub const RLIMIT_MEMLOCK: ::c_int = 6;
+pub const RLIMIT_NPROC: ::c_int = 7;
+pub const RLIMIT_NOFILE: ::c_int = 8;
+pub const RLIM_NLIMITS: ::c_int = 9;
 
 pub const RLIM_INFINITY: rlim_t = 0x7fff_ffff_ffff_ffff;
 pub const RLIM_SAVED_MAX: rlim_t = RLIM_INFINITY;
 pub const RLIM_SAVED_CUR: rlim_t = RLIM_INFINITY;
 
-pub const RUSAGE_SELF: c_int = 0;
-pub const RUSAGE_CHILDREN: c_int = -1;
-pub const RUSAGE_THREAD: c_int = 1;
-
-pub const MADV_NORMAL : c_int = 0;
-pub const MADV_RANDOM : c_int = 1;
-pub const MADV_SEQUENTIAL : c_int = 2;
-pub const MADV_WILLNEED : c_int = 3;
-pub const MADV_DONTNEED : c_int = 4;
-pub const MADV_FREE : c_int = 6;
-
-pub const AF_UNIX: c_int = 1;
-pub const AF_INET: c_int = 2;
-pub const AF_INET6: c_int = 24;
-pub const SOCK_STREAM: c_int = 1;
-pub const SOCK_DGRAM: c_int = 2;
-pub const SOCK_RAW: c_int = 3;
-pub const IPPROTO_TCP: c_int = 6;
-pub const IPPROTO_IP: c_int = 0;
-pub const IPPROTO_IPV6: c_int = 41;
-pub const IP_MULTICAST_TTL: c_int = 10;
-pub const IP_MULTICAST_LOOP: c_int = 11;
-pub const IP_TTL: c_int = 4;
-pub const IP_HDRINCL: c_int = 2;
-pub const IP_ADD_MEMBERSHIP: c_int = 12;
-pub const IP_DROP_MEMBERSHIP: c_int = 13;
-pub const IPV6_ADD_MEMBERSHIP: c_int = 12; // don't exist
-pub const IPV6_DROP_MEMBERSHIP: c_int = 13; // don't exist
-
-pub const TCP_NODELAY: c_int = 0x01;
-pub const SOL_SOCKET: c_int = 0xffff;
-pub const SO_DEBUG: c_int = 0x01;
-pub const SO_ACCEPTCONN: c_int = 0x0002;
-pub const SO_REUSEADDR: c_int = 0x0004;
-pub const SO_KEEPALIVE: c_int = 0x0008;
-pub const SO_DONTROUTE: c_int = 0x0010;
-pub const SO_BROADCAST: c_int = 0x0020;
-pub const SO_USELOOPBACK: c_int = 0x0040;
-pub const SO_LINGER: c_int = 0x0080;
-pub const SO_OOBINLINE: c_int = 0x0100;
-pub const SO_REUSEPORT: c_int = 0x0200;
-pub const SO_SNDBUF: c_int = 0x1001;
-pub const SO_RCVBUF: c_int = 0x1002;
-pub const SO_SNDLOWAT: c_int = 0x1003;
-pub const SO_RCVLOWAT: c_int = 0x1004;
-pub const SO_SNDTIMEO: c_int = 0x1005;
-pub const SO_RCVTIMEO: c_int = 0x1006;
-pub const SO_ERROR: c_int = 0x1007;
-pub const SO_TYPE: c_int = 0x1008;
-
-pub const IFF_LOOPBACK: c_int = 0x8;
-
-pub const SHUT_RD: c_int = 0;
-pub const SHUT_WR: c_int = 1;
-pub const SHUT_RDWR: c_int = 2;
-
-pub const LOCK_SH: c_int = 1;
-pub const LOCK_EX: c_int = 2;
-pub const LOCK_NB: c_int = 4;
-pub const LOCK_UN: c_int = 8;
-
-pub const O_DSYNC : c_int = 128; // same as SYNC
-pub const O_SYNC : c_int = 128;
-pub const O_NONBLOCK : c_int = 4;
-pub const CTL_KERN : c_int = 1;
-pub const KERN_PROC : c_int = 66;
-
-pub const MAP_COPY : c_int = 0x0002;
-pub const MAP_RENAME : c_int = 0x0000;
-pub const MAP_NORESERVE : c_int = 0x0000;
-pub const MAP_NOEXTEND : c_int = 0x0000;
-pub const MAP_HASSEMAPHORE : c_int = 0x0000;
-
-pub const IPPROTO_RAW : c_int = 255;
-
-pub const PATH_MAX: c_int = 1024;
-
-pub const _SC_ARG_MAX : c_int = 1;
-pub const _SC_CHILD_MAX : c_int = 2;
-pub const _SC_CLK_TCK : c_int = 3;
-pub const _SC_NGROUPS_MAX : c_int = 4;
-pub const _SC_OPEN_MAX : c_int = 5;
-pub const _SC_JOB_CONTROL : c_int = 6;
-pub const _SC_SAVED_IDS : c_int = 7;
-pub const _SC_VERSION : c_int = 8;
-pub const _SC_BC_BASE_MAX : c_int = 9;
-pub const _SC_BC_DIM_MAX : c_int = 10;
-pub const _SC_BC_SCALE_MAX : c_int = 11;
-pub const _SC_BC_STRING_MAX : c_int = 12;
-pub const _SC_COLL_WEIGHTS_MAX : c_int = 13;
-pub const _SC_EXPR_NEST_MAX : c_int = 14;
-pub const _SC_LINE_MAX : c_int = 15;
-pub const _SC_RE_DUP_MAX : c_int = 16;
-pub const _SC_2_VERSION : c_int = 17;
-pub const _SC_2_C_BIND : c_int = 18;
-pub const _SC_2_C_DEV : c_int = 19;
-pub const _SC_2_CHAR_TERM : c_int = 20;
-pub const _SC_2_FORT_DEV : c_int = 21;
-pub const _SC_2_FORT_RUN : c_int = 22;
-pub const _SC_2_LOCALEDEF : c_int = 23;
-pub const _SC_2_SW_DEV : c_int = 24;
-pub const _SC_2_UPE : c_int = 25;
-pub const _SC_STREAM_MAX : c_int = 26;
-pub const _SC_TZNAME_MAX : c_int = 27;
-pub const _SC_PAGESIZE : c_int = 28;
-pub const _SC_FSYNC : c_int = 29;
-pub const _SC_SEM_NSEMS_MAX : c_int = 31;
-pub const _SC_SEM_VALUE_MAX : c_int = 32;
-pub const _SC_AIO_LISTIO_MAX : c_int = 42;
-pub const _SC_AIO_MAX : c_int = 43;
-pub const _SC_AIO_PRIO_DELTA_MAX : c_int = 44;
-pub const _SC_ASYNCHRONOUS_IO : c_int = 45;
-pub const _SC_DELAYTIMER_MAX : c_int = 50;
-pub const _SC_MAPPED_FILES : c_int = 53;
-pub const _SC_MEMLOCK : c_int = 54;
-pub const _SC_MEMLOCK_RANGE : c_int = 55;
-pub const _SC_MEMORY_PROTECTION : c_int = 56;
-pub const _SC_MESSAGE_PASSING : c_int = 57;
-pub const _SC_MQ_OPEN_MAX : c_int = 58;
-pub const _SC_PRIORITIZED_IO : c_int = 60;
-pub const _SC_PRIORITY_SCHEDULING : c_int = 61;
-pub const _SC_REALTIME_SIGNALS : c_int = 64;
-pub const _SC_RTSIG_MAX : c_int = 66;
-pub const _SC_SEMAPHORES : c_int = 67;
-pub const _SC_SHARED_MEMORY_OBJECTS : c_int = 68;
-pub const _SC_SIGQUEUE_MAX : c_int = 70;
-pub const _SC_SYNCHRONIZED_IO : c_int = 75;
-pub const _SC_TIMER_MAX : c_int = 93;
-pub const _SC_TIMERS : c_int = 94;
+pub const RUSAGE_SELF: ::c_int = 0;
+pub const RUSAGE_CHILDREN: ::c_int = -1;
+pub const RUSAGE_THREAD: ::c_int = 1;
+
+pub const MADV_NORMAL : ::c_int = 0;
+pub const MADV_RANDOM : ::c_int = 1;
+pub const MADV_SEQUENTIAL : ::c_int = 2;
+pub const MADV_WILLNEED : ::c_int = 3;
+pub const MADV_DONTNEED : ::c_int = 4;
+pub const MADV_FREE : ::c_int = 6;
+
+pub const AF_UNIX: ::c_int = 1;
+pub const AF_INET: ::c_int = 2;
+pub const AF_INET6: ::c_int = 24;
+pub const SOCK_STREAM: ::c_int = 1;
+pub const SOCK_DGRAM: ::c_int = 2;
+pub const SOCK_RAW: ::c_int = 3;
+pub const IPPROTO_TCP: ::c_int = 6;
+pub const IPPROTO_IP: ::c_int = 0;
+pub const IPPROTO_IPV6: ::c_int = 41;
+pub const IP_MULTICAST_TTL: ::c_int = 10;
+pub const IP_MULTICAST_LOOP: ::c_int = 11;
+pub const IP_TTL: ::c_int = 4;
+pub const IP_HDRINCL: ::c_int = 2;
+pub const IP_ADD_MEMBERSHIP: ::c_int = 12;
+pub const IP_DROP_MEMBERSHIP: ::c_int = 13;
+pub const IPV6_ADD_MEMBERSHIP: ::c_int = 12; // don't exist
+pub const IPV6_DROP_MEMBERSHIP: ::c_int = 13; // don't exist
+
+pub const TCP_NODELAY: ::c_int = 0x01;
+pub const SOL_SOCKET: ::c_int = 0xffff;
+pub const SO_DEBUG: ::c_int = 0x01;
+pub const SO_ACCEPTCONN: ::c_int = 0x0002;
+pub const SO_REUSEADDR: ::c_int = 0x0004;
+pub const SO_KEEPALIVE: ::c_int = 0x0008;
+pub const SO_DONTROUTE: ::c_int = 0x0010;
+pub const SO_BROADCAST: ::c_int = 0x0020;
+pub const SO_USELOOPBACK: ::c_int = 0x0040;
+pub const SO_LINGER: ::c_int = 0x0080;
+pub const SO_OOBINLINE: ::c_int = 0x0100;
+pub const SO_REUSEPORT: ::c_int = 0x0200;
+pub const SO_SNDBUF: ::c_int = 0x1001;
+pub const SO_RCVBUF: ::c_int = 0x1002;
+pub const SO_SNDLOWAT: ::c_int = 0x1003;
+pub const SO_RCVLOWAT: ::c_int = 0x1004;
+pub const SO_SNDTIMEO: ::c_int = 0x1005;
+pub const SO_RCVTIMEO: ::c_int = 0x1006;
+pub const SO_ERROR: ::c_int = 0x1007;
+pub const SO_TYPE: ::c_int = 0x1008;
+
+pub const IFF_LOOPBACK: ::c_int = 0x8;
+
+pub const SHUT_RD: ::c_int = 0;
+pub const SHUT_WR: ::c_int = 1;
+pub const SHUT_RDWR: ::c_int = 2;
+
+pub const LOCK_SH: ::c_int = 1;
+pub const LOCK_EX: ::c_int = 2;
+pub const LOCK_NB: ::c_int = 4;
+pub const LOCK_UN: ::c_int = 8;
+
+pub const O_DSYNC : ::c_int = 128; // same as SYNC
+pub const O_SYNC : ::c_int = 128;
+pub const O_NONBLOCK : ::c_int = 4;
+pub const CTL_KERN : ::c_int = 1;
+pub const KERN_PROC : ::c_int = 66;
+
+pub const MAP_COPY : ::c_int = 0x0002;
+pub const MAP_RENAME : ::c_int = 0x0000;
+pub const MAP_NORESERVE : ::c_int = 0x0000;
+pub const MAP_NOEXTEND : ::c_int = 0x0000;
+pub const MAP_HASSEMAPHORE : ::c_int = 0x0000;
+
+pub const IPPROTO_RAW : ::c_int = 255;
+
+pub const PATH_MAX: ::c_int = 1024;
+
+pub const _SC_ARG_MAX : ::c_int = 1;
+pub const _SC_CHILD_MAX : ::c_int = 2;
+pub const _SC_CLK_TCK : ::c_int = 3;
+pub const _SC_NGROUPS_MAX : ::c_int = 4;
+pub const _SC_OPEN_MAX : ::c_int = 5;
+pub const _SC_JOB_CONTROL : ::c_int = 6;
+pub const _SC_SAVED_IDS : ::c_int = 7;
+pub const _SC_VERSION : ::c_int = 8;
+pub const _SC_BC_BASE_MAX : ::c_int = 9;
+pub const _SC_BC_DIM_MAX : ::c_int = 10;
+pub const _SC_BC_SCALE_MAX : ::c_int = 11;
+pub const _SC_BC_STRING_MAX : ::c_int = 12;
+pub const _SC_COLL_WEIGHTS_MAX : ::c_int = 13;
+pub const _SC_EXPR_NEST_MAX : ::c_int = 14;
+pub const _SC_LINE_MAX : ::c_int = 15;
+pub const _SC_RE_DUP_MAX : ::c_int = 16;
+pub const _SC_2_VERSION : ::c_int = 17;
+pub const _SC_2_C_BIND : ::c_int = 18;
+pub const _SC_2_C_DEV : ::c_int = 19;
+pub const _SC_2_CHAR_TERM : ::c_int = 20;
+pub const _SC_2_FORT_DEV : ::c_int = 21;
+pub const _SC_2_FORT_RUN : ::c_int = 22;
+pub const _SC_2_LOCALEDEF : ::c_int = 23;
+pub const _SC_2_SW_DEV : ::c_int = 24;
+pub const _SC_2_UPE : ::c_int = 25;
+pub const _SC_STREAM_MAX : ::c_int = 26;
+pub const _SC_TZNAME_MAX : ::c_int = 27;
+pub const _SC_PAGESIZE : ::c_int = 28;
+pub const _SC_FSYNC : ::c_int = 29;
+pub const _SC_SEM_NSEMS_MAX : ::c_int = 31;
+pub const _SC_SEM_VALUE_MAX : ::c_int = 32;
+pub const _SC_AIO_LISTIO_MAX : ::c_int = 42;
+pub const _SC_AIO_MAX : ::c_int = 43;
+pub const _SC_AIO_PRIO_DELTA_MAX : ::c_int = 44;
+pub const _SC_ASYNCHRONOUS_IO : ::c_int = 45;
+pub const _SC_DELAYTIMER_MAX : ::c_int = 50;
+pub const _SC_MAPPED_FILES : ::c_int = 53;
+pub const _SC_MEMLOCK : ::c_int = 54;
+pub const _SC_MEMLOCK_RANGE : ::c_int = 55;
+pub const _SC_MEMORY_PROTECTION : ::c_int = 56;
+pub const _SC_MESSAGE_PASSING : ::c_int = 57;
+pub const _SC_MQ_OPEN_MAX : ::c_int = 58;
+pub const _SC_PRIORITIZED_IO : ::c_int = 60;
+pub const _SC_PRIORITY_SCHEDULING : ::c_int = 61;
+pub const _SC_REALTIME_SIGNALS : ::c_int = 64;
+pub const _SC_RTSIG_MAX : ::c_int = 66;
+pub const _SC_SEMAPHORES : ::c_int = 67;
+pub const _SC_SHARED_MEMORY_OBJECTS : ::c_int = 68;
+pub const _SC_SIGQUEUE_MAX : ::c_int = 70;
+pub const _SC_SYNCHRONIZED_IO : ::c_int = 75;
+pub const _SC_TIMER_MAX : ::c_int = 93;
+pub const _SC_TIMERS : ::c_int = 94;
 
 pub const PTHREAD_MUTEX_INITIALIZER: pthread_mutex_t = 0 as *mut _;
 pub const PTHREAD_COND_INITIALIZER: pthread_cond_t = 0 as *mut _;
@@ -504,28 +498,28 @@ pub const PTHREAD_MUTEX_RECURSIVE: ::c_int = 2;
 pub const SIGSTKSZ: ::size_t = 131072;
 
 extern {
-    pub fn mprotect(addr: *const ::c_void, len: size_t, prot: c_int)
-                    -> c_int;
+    pub fn mprotect(addr: *const ::c_void, len: ::size_t, prot: ::c_int)
+                    -> ::c_int;
     pub fn shm_open(name: *const ::c_char, oflag: ::c_int, mode: ::mode_t)
                     -> ::c_int;
-    pub fn sysctl(name: *mut c_int,
-                  namelen: c_uint,
+    pub fn sysctl(name: *mut ::c_int,
+                  namelen: ::c_uint,
                   oldp: *mut ::c_void,
-                  oldlenp: *mut size_t,
+                  oldlenp: *mut ::size_t,
                   newp: *mut ::c_void,
-                  newlen: size_t)
-                  -> c_int;
-    pub fn sysctlbyname(name: *const c_char,
+                  newlen: ::size_t)
+                  -> ::c_int;
+    pub fn sysctlbyname(name: *const ::c_char,
                         oldp: *mut ::c_void,
-                        oldlenp: *mut size_t,
+                        oldlenp: *mut ::size_t,
                         newp: *mut ::c_void,
-                        newlen: size_t)
-                        -> c_int;
+                        newlen: ::size_t)
+                        -> ::c_int;
     pub fn clock_gettime(clk_id: ::c_int, tp: *mut ::timespec) -> ::c_int;
     pub fn pthread_set_name_np(tid: ::pthread_t, name: *const ::c_char);
     pub fn pthread_main_np() -> ::c_uint;
-    pub fn pthread_stackseg_np(thread: pthread_t,
-                               sinfo: *mut stack_t) -> ::c_uint;
+    pub fn pthread_stackseg_np(thread: ::pthread_t,
+                               sinfo: *mut ::stack_t) -> ::c_uint;
     pub fn __errno() -> *const ::c_int;
     pub fn backtrace(buf: *mut *mut ::c_void,
                      sz: ::size_t) -> ::size_t;
@@ -534,9 +528,9 @@ extern {
 cfg_if! {
     if #[cfg(target_os = "bitrig")] {
         mod bitrig;
-        use self::bitrig::*;
+        pub use self::bitrig::*;
     } else {
         mod openbsd;
-        use self::openbsd::*;
+        pub use self::openbsd::*;
     }
 }
diff --git a/src/unix/bsd/openbsdlike/openbsd.rs b/src/unix/bsd/openbsdlike/openbsd.rs
index 417c8a559f..fa659d057a 100644
--- a/src/unix/bsd/openbsdlike/openbsd.rs
+++ b/src/unix/bsd/openbsdlike/openbsd.rs
@@ -1,18 +1,18 @@
 s! {
     pub struct glob_t {
-        pub gl_pathc:  c_int,
-        __unused1: c_int,
-        pub gl_offs:   c_int,
-        __unused2: c_int,
-        pub gl_pathv:  *mut *mut c_char,
+        pub gl_pathc:   ::c_int,
+        __unused1:      ::c_int,
+        pub gl_offs:    ::c_int,
+        __unused2:      ::c_int,
+        pub gl_pathv:   *mut *mut ::c_char,
 
-        __unused3: *mut c_void,
+        __unused3: *mut ::c_void,
 
-        __unused4: *mut c_void,
-        __unused5: *mut c_void,
-        __unused6: *mut c_void,
-        __unused7: *mut c_void,
-        __unused8: *mut c_void,
-        __unused9: *mut c_void,
+        __unused4: *mut ::c_void,
+        __unused5: *mut ::c_void,
+        __unused6: *mut ::c_void,
+        __unused7: *mut ::c_void,
+        __unused8: *mut ::c_void,
+        __unused9: *mut ::c_void,
     }
 }