Switch over to libc::c_void

Author: faern

generate_bindings.sh

@@ -44,7 +44,7 @@ bindgen \
     --raw-line "use core_foundation_sys::runloop::CFRunLoopRef;" \
     --raw-line "" \
     --raw-line "use dispatch_queue_t;" \
-    --raw-line "use std::os::raw::c_void;" \
+    --raw-line "use libc::c_void;" \
     --raw-line "" \
     --raw-line "pub type AuthorizationOpaqueRef = c_void;" \
     --raw-line "pub type __SCPreferences = c_void;" \
@@ -113,9 +113,8 @@ bindgen \
     --raw-line "use core_foundation_sys::runloop::CFRunLoopRef;" \
     --raw-line "" \
     --raw-line "use dispatch_queue_t;" \
-    --raw-line "use libc::sockaddr;" \
+    --raw-line "use libc::{c_void, c_char, c_int, sockaddr};" \
     --raw-line "use preferences::SCPreferencesRef;" \
-    --raw-line "use std::os::raw::{c_void, c_char, c_int};" \
     --raw-line "" \
     --raw-line "pub type __SCNetworkReachability = c_void;" \
     --raw-line "pub type __SCNetworkConnection = c_void;" \

system-configuration-sys/src/dynamic_store.rs

@@ -12,7 +12,7 @@ use core_foundation_sys::runloop::CFRunLoopSourceRef;
 use core_foundation_sys::string::CFStringRef;
 
 use dispatch_queue_t;
-use std::os::raw::c_void;
+use libc::c_void;
 
 pub type __SCDynamicStore = c_void;
 pub type SCDynamicStoreRef = *const __SCDynamicStore;

system-configuration-sys/src/lib.rs

@@ -20,7 +20,7 @@ pub extern crate core_foundation_sys;
 pub extern crate libc;
 
 /// This is a temporary solution.
-pub type dispatch_queue_t = *mut ::std::os::raw::c_void;
+pub type dispatch_queue_t = *mut libc::c_void;
 
 pub mod dynamic_store;
 pub mod network_configuration;

system-configuration-sys/src/network_configuration.rs

@@ -11,9 +11,8 @@ use core_foundation_sys::runloop::CFRunLoopRef;
 use core_foundation_sys::string::CFStringRef;
 
 use dispatch_queue_t;
-use libc::sockaddr;
+use libc::{c_char, c_int, c_void, sockaddr};
 use preferences::SCPreferencesRef;
-use std::os::raw::{c_char, c_int, c_void};
 
 pub type __SCNetworkReachability = c_void;
 pub type SCNetworkReachabilityRef = *const __SCNetworkReachability;

system-configuration-sys/src/preferences.rs

@@ -12,7 +12,7 @@ use core_foundation_sys::runloop::CFRunLoopRef;
 use core_foundation_sys::string::CFStringRef;
 
 use dispatch_queue_t;
-use std::os::raw::c_void;
+use libc::c_void;
 
 pub type AuthorizationOpaqueRef = c_void;
 pub type AuthorizationRef = *const AuthorizationOpaqueRef;

system-configuration/src/dynamic_store.rs

@@ -21,8 +21,8 @@ use core_foundation::runloop::CFRunLoopSource;
 use core_foundation::string::CFString;
 
 pub use system_configuration_sys::dynamic_store::*;
+use system_configuration_sys::libc::c_void;
 
-use std::os::raw::c_void;
 use std::ptr;
 
 /// Struct describing the callback happening when a watched value in the dynamic store is changed.