Prefer getting C types from libc instead of std::os::raw

This allows botan-sys to be no_std by default.

The wrapper crate relies on Vec, String, CString and may prove
difficult to convert to no_std, not really sure.

See #10

botan-sys/Cargo.toml

@@ -19,3 +19,5 @@ travis-ci = { repository = "randombit/botan-rs" }
 status = "actively-developed"
 
 [dependencies]
+# we don't need std support
+libc = { version = "0.2", default-features = false }

botan-sys/src/block.rs

@@ -1,4 +1,4 @@
-use std::os::raw::{c_int, c_char};
+use libc::{c_int, c_char};
 
 pub enum botan_block_cipher_struct {}
 pub type botan_block_cipher_t = *mut botan_block_cipher_struct;

botan-sys/src/cipher.rs

@@ -1,4 +1,4 @@
-use std::os::raw::{c_int, c_char};
+use libc::{c_int, c_char};
 
 pub enum botan_cipher_struct {}
 pub type botan_cipher_t = *mut botan_cipher_struct;

botan-sys/src/errors.rs

@@ -1,4 +1,4 @@
-use std::os::raw::{c_int, c_char};
+use libc::{c_int, c_char};
 
 pub type BOTAN_FFI_ERROR = c_int;
 

botan-sys/src/fpe.rs

@@ -1,4 +1,4 @@
-use std::os::raw::{c_int};
+use libc::{c_int};
 
 use mp::botan_mp_t;
 

botan-sys/src/hash.rs

@@ -1,4 +1,4 @@
-use std::os::raw::{c_int, c_char};
+use libc::{c_int, c_char};
 
 pub enum botan_hash_struct {}
 pub type botan_hash_t = *mut botan_hash_struct;

botan-sys/src/kdf.rs

@@ -1,4 +1,4 @@
-use std::os::raw::{c_int, c_char};
+use libc::{c_int, c_char};
 
 extern "C" {
 

botan-sys/src/keywrap.rs

@@ -1,4 +1,4 @@
-use std::os::raw::{c_int};
+use libc::{c_int};
 
 extern "C" {
 

botan-sys/src/lib.rs

@@ -1,6 +1,10 @@
 #![deny(warnings)]
 #![allow(non_camel_case_types)]
 
+#![no_std]
+
+extern crate libc;
+
 mod block;
 mod cipher;
 mod errors;

botan-sys/src/mac.rs

@@ -1,4 +1,4 @@
-use std::os::raw::{c_int, c_char};
+use libc::{c_int, c_char};
 
 pub enum botan_mac_struct {}
 pub type botan_mac_t = *mut botan_mac_struct;

botan-sys/src/mp.rs

@@ -1,4 +1,4 @@
-use std::os::raw::{c_int, c_char};
+use libc::{c_int, c_char};
 
 use rng::botan_rng_t;
 

botan-sys/src/otp.rs

@@ -1,4 +1,4 @@
-use std::os::raw::{c_int, c_char};
+use libc::{c_int, c_char};
 
 pub enum botan_hotp_struct {}
 pub type botan_hotp_t = *mut botan_hotp_struct;

botan-sys/src/passhash.rs

@@ -1,4 +1,4 @@
-use std::os::raw::{c_int, c_char};
+use libc::{c_int, c_char};
 
 use rng::botan_rng_t;
 

botan-sys/src/pk_ops.rs

@@ -1,4 +1,4 @@
-use std::os::raw::{c_int, c_char};
+use libc::{c_int, c_char};
 
 use rng::botan_rng_t;
 use pubkey::{botan_pubkey_t, botan_privkey_t};

botan-sys/src/pubkey.rs

@@ -1,4 +1,4 @@
-use std::os::raw::{c_int, c_char};
+use libc::{c_int, c_char};
 
 use mp::botan_mp_t;
 use rng::botan_rng_t;

botan-sys/src/rng.rs

@@ -1,4 +1,4 @@
-use std::os::raw::{c_int, c_char};
+use libc::{c_int, c_char};
 
 pub enum botan_rng_struct {}
 pub type botan_rng_t = *mut botan_rng_struct;

botan-sys/src/utils.rs

@@ -1,4 +1,4 @@
-use std::os::raw::{c_int, c_char, c_void};
+use libc::{c_int, c_char, c_void};
 
 extern "C" {
 

botan-sys/src/version.rs

@@ -1,4 +1,4 @@
-use std::os::raw::{c_int, c_char};
+use libc::{c_int, c_char};
 
 extern "C" {
 

botan-sys/src/x509.rs

@@ -1,4 +1,4 @@
-use std::os::raw::{c_int, c_char, c_uint};
+use libc::{c_int, c_char, c_uint};
 
 use pubkey::{botan_pubkey_t, botan_privkey_t};
 use rng::botan_rng_t;

botan/Cargo.toml

@@ -19,3 +19,5 @@ status = "actively-developed"
 
 [dependencies]
 botan-sys = { version = "0.4.0", path = "../botan-sys" }
+# we don't need std support
+libc = { version = "0.2", default-features = false }

botan/src/lib.rs

@@ -6,6 +6,7 @@
 //! A wrapper for the Botan cryptography library
 
 extern crate botan_sys;
+extern crate libc;
 
 macro_rules! call_botan {
     ($x:expr) => {

botan/src/utils.rs

@@ -1,6 +1,6 @@
 use botan_sys::*;
 
-pub(crate) use std::os::raw::{c_char, c_int, c_void};
+pub(crate) use libc::{c_char, c_int, c_void};
 pub(crate) use std::ffi::{CStr, CString};
 pub(crate) use std::ptr;
 pub(crate) use std::mem;