From e62c977b93565046b403f0195910e2360e08587f Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Thu, 4 Feb 2016 22:20:06 -0800 Subject: [PATCH] Prefer libc::time_t over std::*::time_t This already links to libc which is responsible for the correct definitions rather than libstd itself. --- src/file.rs | 4 +--- src/filesys.rs | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/file.rs b/src/file.rs index b8920e7..ca8eada 100644 --- a/src/file.rs +++ b/src/file.rs @@ -1,6 +1,4 @@ -use std::os::unix::raw::time_t; - -use ::libc::{c_void,c_int,c_char,c_uchar,c_ulong,size_t}; +use ::libc::{c_void,c_int,c_char,c_uchar,c_ulong,size_t,time_t}; // TODO: should be *const c_char pub const GP_MIME_WAV: &'static [u8] = b"audio/wav\0"; diff --git a/src/filesys.rs b/src/filesys.rs index 23e0283..3034a7c 100644 --- a/src/filesys.rs +++ b/src/filesys.rs @@ -1,8 +1,6 @@ // exports from gphoto2-filesys.h -use std::os::unix::raw::time_t; - -use ::libc::{c_int,c_char}; +use ::libc::{c_int,c_char,time_t}; #[repr(C)] pub struct CameraStorageInformation {