From 83c81680dc6f623f54b4c74542902cbeb13efe45 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Fri, 18 Sep 2015 15:01:06 -0700
Subject: [PATCH] Consolidate freebsd arch's upwards

---
 src/unix/bsd/freebsdlike/mod.rs    | 29 +++++++++++++++++++++++++++++
 src/unix/bsd/freebsdlike/x86.rs    | 28 ----------------------------
 src/unix/bsd/freebsdlike/x86_64.rs | 28 ----------------------------
 3 files changed, 29 insertions(+), 56 deletions(-)

diff --git a/src/unix/bsd/freebsdlike/mod.rs b/src/unix/bsd/freebsdlike/mod.rs
index 7fafaf91..11bf8302 100644
--- a/src/unix/bsd/freebsdlike/mod.rs
+++ b/src/unix/bsd/freebsdlike/mod.rs
@@ -1,3 +1,32 @@
+pub type c_char = i8;
+pub type c_schar = i8;
+pub type c_uchar = u8;
+pub type c_short = i16;
+pub type c_ushort = u16;
+pub type c_int = i32;
+pub type c_uint = u32;
+pub type c_float = f32;
+pub type c_double = f64;
+pub type clock_t = i32;
+pub type wchar_t = i32;
+pub type c_longlong = i64;
+pub type c_ulonglong = u64;
+pub type intmax_t = i64;
+pub type uintmax_t = u64;
+pub type off_t = i64;
+pub type dev_t = u32;
+pub type ino_t = u32;
+pub type pid_t = i32;
+pub type uid_t = u32;
+pub type gid_t = u32;
+pub type useconds_t = u32;
+pub type mode_t = u16;
+pub type nlink_t = u16;
+pub type blksize_t = u32;
+pub type blkcnt_t = i64;
+pub type fflags_t = u32;
+pub type pthread_attr_t = *mut ::c_void;
+
 pub type pthread_t = uintptr_t;
 pub type rlim_t = i64;
 pub type sighandler_t = size_t;
diff --git a/src/unix/bsd/freebsdlike/x86.rs b/src/unix/bsd/freebsdlike/x86.rs
index 5a80c0d4..3be08eee 100644
--- a/src/unix/bsd/freebsdlike/x86.rs
+++ b/src/unix/bsd/freebsdlike/x86.rs
@@ -1,40 +1,12 @@
-pub type c_char = i8;
-pub type c_schar = i8;
-pub type c_uchar = u8;
-pub type c_short = i16;
-pub type c_ushort = u16;
-pub type c_int = i32;
-pub type c_uint = u32;
 pub type c_long = i32;
 pub type c_ulong = u32;
-pub type c_float = f32;
-pub type c_double = f64;
 pub type size_t = u32;
 pub type ptrdiff_t = i32;
-pub type clock_t = i32;
 pub type time_t = i32;
 pub type suseconds_t = i32;
-pub type wchar_t = i32;
-pub type c_longlong = i64;
-pub type c_ulonglong = u64;
 pub type intptr_t = i32;
 pub type uintptr_t = u32;
-pub type intmax_t = i64;
-pub type uintmax_t = u64;
-pub type off_t = i64;
-pub type dev_t = u32;
-pub type ino_t = u32;
-pub type pid_t = i32;
-pub type uid_t = u32;
-pub type gid_t = u32;
-pub type useconds_t = u32;
-pub type mode_t = u16;
 pub type ssize_t = i32;
-pub type nlink_t = u16;
-pub type blksize_t = u32;
-pub type blkcnt_t = i64;
-pub type fflags_t = u32;
-pub type pthread_attr_t = *mut c_void;
 
 s! {
     pub struct stat {
diff --git a/src/unix/bsd/freebsdlike/x86_64.rs b/src/unix/bsd/freebsdlike/x86_64.rs
index bacea737..c4537442 100644
--- a/src/unix/bsd/freebsdlike/x86_64.rs
+++ b/src/unix/bsd/freebsdlike/x86_64.rs
@@ -1,40 +1,12 @@
-pub type c_char = i8;
-pub type c_schar = i8;
-pub type c_uchar = u8;
-pub type c_short = i16;
-pub type c_ushort = u16;
-pub type c_int = i32;
-pub type c_uint = u32;
 pub type c_long = i64;
 pub type c_ulong = u64;
-pub type c_float = f32;
-pub type c_double = f64;
 pub type size_t = u64;
 pub type ptrdiff_t = i64;
-pub type clock_t = i32;
 pub type time_t = i64;
 pub type suseconds_t = i64;
-pub type wchar_t = i32;
-pub type c_longlong = i64;
-pub type c_ulonglong = u64;
 pub type intptr_t = i64;
 pub type uintptr_t = u64;
-pub type intmax_t = i64;
-pub type uintmax_t = u64;
-pub type off_t = i64;
-pub type dev_t = u32;
-pub type ino_t = u32;
-pub type pid_t = i32;
-pub type uid_t = u32;
-pub type gid_t = u32;
-pub type useconds_t = u32;
-pub type mode_t = u16;
 pub type ssize_t = i64;
-pub type nlink_t = u16;
-pub type blksize_t = u32;
-pub type blkcnt_t = i64;
-pub type fflags_t = u32;
-pub type pthread_attr_t = *mut ::c_void;
 
 s! {
     pub struct stat {