From 7f676b86994edcd6adf27018a5d18e957c9390ab Mon Sep 17 00:00:00 2001
From: Keegan McAllister <kmcallister@mozilla.com>
Date: Wed, 3 Sep 2014 18:56:37 -0700
Subject: [PATCH] Fix some non-FFI-safe types in externs

---
 src/liblibc/lib.rs | 2 +-
 src/libtime/lib.rs | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/liblibc/lib.rs b/src/liblibc/lib.rs
index 52e5de249317f..3645ef077a6af 100644
--- a/src/liblibc/lib.rs
+++ b/src/liblibc/lib.rs
@@ -4542,7 +4542,7 @@ pub mod funcs {
                 pub fn glob(pattern: *const c_char,
                             flags: c_int,
                             errfunc: ::Nullable<extern "C" fn(epath: *const c_char,
-                                                              errno: c_int) -> int>,
+                                                              errno: c_int) -> c_int>,
                             pglob: *mut glob_t);
                 pub fn globfree(pglob: *mut glob_t);
             }
diff --git a/src/libtime/lib.rs b/src/libtime/lib.rs
index 34402d01c865d..eef9d7cf09a64 100644
--- a/src/libtime/lib.rs
+++ b/src/libtime/lib.rs
@@ -229,6 +229,8 @@ pub fn tzset() {
 
 /// Holds a calendar date and time broken down into its components (year, month, day, and so on),
 /// also called a broken-down time value.
+// FIXME: use c_int instead of i32?
+#[repr(C)]
 #[deriving(Clone, PartialEq, Eq, Show)]
 pub struct Tm {
     /// Seconds after the minute - [0, 60]