Cast pointers std::os::raw::c_void (shortened to std_c_void) instead of using libc::c_void

Author: nbigaouette-eai

src/buffer.rs

@@ -17,6 +17,7 @@ use std::ops::Range;
 use std::ops::RangeFrom;
 use std::ops::RangeFull;
 use std::ops::RangeTo;
+use std::os::raw::c_void as std_c_void;
 use std::ptr;
 use std::slice;
 use super::BufferTrait;
@@ -65,7 +66,7 @@ impl<T: TensorType> Buffer<T> {
             let msg = CStr::from_ptr(c_msg);
             panic!("Failed to allocate: {}", msg.to_str().unwrap());
         }
-        (*inner).data = ptr;
+        (*inner).data = ptr as *mut std_c_void;
         (*inner).length = len;
         (*inner).data_deallocator = Some(deallocator);
         Buffer {
@@ -81,7 +82,7 @@ impl<T: TensorType> Buffer<T> {
     /// The underlying data is *not* freed when the buffer is destroyed.
     pub unsafe fn from_ptr(ptr: *mut T, len: usize) -> Self {
         let inner = tf::TF_NewBuffer();
-        (*inner).data = ptr as *const c_void;
+        (*inner).data = ptr as *const std_c_void;
         (*inner).length = len;
         Buffer {
             inner: inner,
@@ -155,8 +156,8 @@ impl<T: TensorType> BufferTrait for Buffer<T> {
     }
 }
 
-unsafe extern "C" fn deallocator(data: *mut c_void, _length: size_t) {
-    libc::free(data);
+unsafe extern "C" fn deallocator(data: *mut std_c_void, _length: size_t) {
+    libc::free(data as *mut c_void);
 }
 
 impl<T: TensorType> Drop for Buffer<T> {

src/graph.rs

@@ -9,6 +9,7 @@ use std;
 use std::ffi::CStr;
 use std::ffi::CString;
 use std::ffi::NulError;
+use std::os::raw::c_void as std_c_void;
 use std::ptr;
 use std::str::Utf8Error;
 use std::sync::Arc;
@@ -606,7 +607,7 @@ impl<'a> OperationDescription<'a> {
         unsafe {
             tf::TF_SetAttrString(self.inner,
                                  c_attr_name.as_ptr(),
-                                 c_value.as_ptr() as *const c_void,
+                                 c_value.as_ptr() as *const std_c_void,
                                  c_value.len() as size_t);
         }
         Ok(())
@@ -625,7 +626,7 @@ impl<'a> OperationDescription<'a> {
         unsafe {
             tf::TF_SetAttrStringList(self.inner,
                                      c_attr_name.as_ptr(),
-                                     ptrs.as_ptr(),
+                                     ptrs.as_ptr() as *const *const std_c_void,
                                      lens.as_ptr(),
                                      ptrs.len() as c_int);
         }
@@ -821,7 +822,7 @@ impl<'a> OperationDescription<'a> {
         unsafe {
             tf::TF_SetAttrTensorShapeProto(self.inner,
                                            c_attr_name.as_ptr(),
-                                           value.as_ptr() as *const c_void,
+                                           value.as_ptr() as *const std_c_void,
                                            value.len() as size_t,
                                            status.inner());
         }
@@ -843,7 +844,7 @@ impl<'a> OperationDescription<'a> {
         unsafe {
             tf::TF_SetAttrTensorShapeProtoList(self.inner,
                                                c_attr_name.as_ptr(),
-                                               ptrs.as_ptr(),
+                                               ptrs.as_ptr() as *const *const std_c_void,
                                                lens.as_ptr(),
                                                ptrs.len() as c_int,
                                                status.inner());
@@ -893,7 +894,7 @@ impl<'a> OperationDescription<'a> {
         unsafe {
             tf::TF_SetAttrValueProto(self.inner,
                                      c_attr_name.as_ptr(),
-                                     value.as_ptr() as *const c_void,
+                                     value.as_ptr() as *const std_c_void,
                                      // Allow trivial_numeric_casts because usize is not
                                      // necessarily size_t.
                                      value.len() as size_t,

src/lib.rs

@@ -30,6 +30,7 @@ use std::ops::Deref;
 use std::ops::DerefMut;
 use std::ops::Drop;
 use std::ops::Index;
+use std::os::raw::c_void as std_c_void;
 use std::str::Utf8Error;
 
 ////////////////////////
@@ -844,9 +845,9 @@ pub struct Tensor<T: TensorType> {
     owned: bool,
 }
 
-unsafe extern "C" fn noop_deallocator(_: *mut c_void, _: size_t, _: *mut c_void) -> () {}
+unsafe extern "C" fn noop_deallocator(_: *mut std_c_void, _: size_t, _: *mut std_c_void) -> () {}
 
-unsafe extern "C" fn deallocator(_: *mut c_void, _: size_t, buffer: *mut c_void) -> () {
+unsafe extern "C" fn deallocator(_: *mut std_c_void, _: size_t, buffer: *mut std_c_void) -> () {
     tf::TF_DeleteBuffer(buffer as *mut tf::TF_Buffer);
 }