Merge pull request #58 from spacejam/tyler_libc_0.2.10

Bump libc crate to 0.2.10, audit u64 and usize usage in ffi
master
Tyler Neely 9 years ago
commit eb275813e8
  1. 2
      Cargo.toml
  2. 8
      src/ffi.rs
  3. 2
      src/rocksdb_options.rs

@ -24,4 +24,4 @@ name = "test"
path = "test/test.rs"
[dependencies]
libc = "0.1.8"
libc = "0.2.10"

@ -162,17 +162,17 @@ extern "C" {
pub fn rocksdb_options_set_level0_stop_writes_trigger(options: DBOptions,
no: c_int);
pub fn rocksdb_options_set_write_buffer_size(options: DBOptions,
bytes: u64);
bytes: usize);
pub fn rocksdb_options_set_target_file_size_base(options: DBOptions,
bytes: u64);
pub fn rocksdb_options_set_target_file_size_multiplier(options: DBOptions,
mul: c_int);
pub fn rocksdb_options_set_max_log_file_size(options: DBOptions,
bytes: u64);
bytes: usize);
pub fn rocksdb_options_set_max_manifest_file_size(options: DBOptions,
bytes: u64);
bytes: usize);
pub fn rocksdb_options_set_hash_skip_list_rep(options: DBOptions,
bytes: u64,
bytes: usize,
a1: i32,
a2: i32);
pub fn rocksdb_options_set_compaction_style(options: DBOptions,

@ -69,7 +69,7 @@ impl BlockBasedOptions {
BlockBasedOptions { inner: block_opts }
}
pub fn set_block_size(&mut self, size: u64) {
pub fn set_block_size(&mut self, size: usize) {
unsafe {
rocksdb_ffi::rocksdb_block_based_options_set_block_size(self.inner,
size);

Loading…
Cancel
Save