Removed libc dependency from objc by using std::os::raw types.

Author: SSheldon

Cargo.toml

@@ -17,7 +17,6 @@ exception = ["objc_exception"]
 verify_message = []
 
 [dependencies]
-libc = ">= 0.1, < 0.3"
 malloc_buf = "0.0"
 
 [dependencies.objc_exception]

src/declare.rs

@@ -38,7 +38,6 @@ use std::error::Error;
 use std::ffi::CString;
 use std::fmt;
 use std::mem;
-use libc::size_t;
 
 use {Encode, Encoding, Message};
 use runtime::{Class, Imp, NO, Object, Sel, self};
@@ -204,7 +203,7 @@ impl ClassDecl {
     pub fn add_ivar<T>(&mut self, name: &str) where T: Encode {
         let c_name = CString::new(name).unwrap();
         let encoding = CString::new(T::encode().as_str()).unwrap();
-        let size = mem::size_of::<T>() as size_t;
+        let size = mem::size_of::<T>();
         let align = mem::align_of::<T>() as u8;
         let success = unsafe {
             runtime::class_addIvar(self.cls, c_name.as_ptr(), size, align,

src/encode.rs

@@ -1,7 +1,7 @@
 use std::ffi::CStr;
 use std::fmt;
+use std::os::raw::{c_char, c_void};
 use std::str;
-use libc::{c_char, c_void};
 use malloc_buf::MallocBuffer;
 
 use runtime::{Class, Object, Sel};

src/lib.rs

@@ -39,7 +39,6 @@ preventing Objective-C from unwinding into Rust.
 
 #![warn(missing_docs)]
 
-extern crate libc;
 extern crate malloc_buf;
 #[cfg(feature = "exception")]
 extern crate objc_exception;

src/runtime.rs

@@ -5,9 +5,9 @@
 
 use std::ffi::{CStr, CString};
 use std::fmt;
+use std::os::raw::{c_char, c_int, c_uint, c_void};
 use std::ptr;
 use std::str;
-use libc::{c_char, c_int, c_uint, c_void, ptrdiff_t, size_t};
 use malloc_buf::MallocBuffer;
 
 use encode;
@@ -17,7 +17,7 @@ use {Encode, Encoding};
 ///
 /// To convert an Objective-C `BOOL` into a Rust `bool`, compare it with `NO`.
 #[cfg(not(target_arch = "aarch64"))]
-pub type BOOL = ::libc::c_schar;
+pub type BOOL = ::std::os::raw::c_schar;
 /// The equivalent of true for Objective-C's `BOOL` type.
 #[cfg(not(target_arch = "aarch64"))]
 pub const YES: BOOL = 1;
@@ -85,15 +85,15 @@ extern {
 
     pub fn class_getName(cls: *const Class) -> *const c_char;
     pub fn class_getSuperclass(cls: *const Class) -> *const Class;
-    pub fn class_getInstanceSize(cls: *const Class) -> size_t;
+    pub fn class_getInstanceSize(cls: *const Class) -> usize;
     pub fn class_getInstanceMethod(cls: *const Class, sel: Sel) -> *const Method;
     pub fn class_getInstanceVariable(cls: *const Class, name: *const c_char) -> *const Ivar;
     pub fn class_copyMethodList(cls: *const Class, outCount: *mut c_uint) -> *mut *const Method;
     pub fn class_copyIvarList(cls: *const Class, outCount: *mut c_uint) -> *mut *const Ivar;
     pub fn class_addMethod(cls: *mut Class, name: Sel, imp: Imp, types: *const c_char) -> BOOL;
-    pub fn class_addIvar(cls: *mut Class, name: *const c_char, size: size_t, alignment: u8, types: *const c_char) -> BOOL;
+    pub fn class_addIvar(cls: *mut Class, name: *const c_char, size: usize, alignment: u8, types: *const c_char) -> BOOL;
 
-    pub fn objc_allocateClassPair(superclass: *const Class, name: *const c_char, extraBytes: size_t) -> *mut Class;
+    pub fn objc_allocateClassPair(superclass: *const Class, name: *const c_char, extraBytes: usize) -> *mut Class;
     pub fn objc_disposeClassPair(cls: *mut Class);
     pub fn objc_registerClassPair(cls: *mut Class);
 
@@ -104,7 +104,7 @@ extern {
     pub fn objc_getClass(name: *const c_char) -> *const Class;
 
     pub fn ivar_getName(ivar: *const Ivar) -> *const c_char;
-    pub fn ivar_getOffset(ivar: *const Ivar) -> ptrdiff_t;
+    pub fn ivar_getOffset(ivar: *const Ivar) -> isize;
     pub fn ivar_getTypeEncoding(ivar: *const Ivar) -> *const c_char;
 
     pub fn objc_msgSend(obj: *mut Object, op: Sel, ...) -> *mut Object;