diff options
| author | bors <bors@rust-lang.org> | 2016-02-22 07:08:25 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-02-22 07:08:25 +0000 |
| commit | 98a59cf57e02b6e6a5a3bd74eb47b1422eaacc53 (patch) | |
| tree | feff78f31b01458ebdebd5e846800010f9df6afb /src/libstd/os | |
| parent | e628398f3464ef4bb60c3a05006064e1633e3d6f (diff) | |
| parent | e77c79e96d600b9179b1697037e1c0a52558c8f2 (diff) | |
| download | rust-98a59cf57e02b6e6a5a3bd74eb47b1422eaacc53.tar.gz rust-98a59cf57e02b6e6a5a3bd74eb47b1422eaacc53.zip | |
Auto merge of #31813 - nbaksalyar:solaris-fix, r=sanxiyn
A quick fix for several issues that break a Solaris/Illumos build. Also, adds a CPU target specification (as seen in a patch for OpenBSD #31727).
Diffstat (limited to 'src/libstd/os')
| -rw-r--r-- | src/libstd/os/solaris/fs.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/os/solaris/fs.rs b/src/libstd/os/solaris/fs.rs index 1c043af735a..5dc43d03a86 100644 --- a/src/libstd/os/solaris/fs.rs +++ b/src/libstd/os/solaris/fs.rs @@ -73,7 +73,7 @@ impl MetadataExt for Metadata { #[allow(deprecated)] fn as_raw_stat(&self) -> &raw::stat { unsafe { - &*(self.as_inner().as_inner() as *const libc::stat64 + &*(self.as_inner().as_inner() as *const libc::stat as *const raw::stat) } } |