diff options
| author | Stefan Plantikow <stefan.plantikow@googlemail.com> | 2012-01-05 00:11:25 +0100 |
|---|---|---|
| committer | Stefan Plantikow <stefan.plantikow@googlemail.com> | 2012-01-05 02:07:12 +0100 |
| commit | 6284190ef9918e05cb9147a2a81100ddcb06fea8 (patch) | |
| tree | e5e8075a4de03db9c4efee2b6d994343a674b3b5 /src/libstd/std.rc | |
| parent | 16405386f0a843167e234d8d54855a537b0f261d (diff) | |
| parent | 3971b520bcdd556ff78120c77ffd13785e1c3695 (diff) | |
| download | rust-6284190ef9918e05cb9147a2a81100ddcb06fea8.tar.gz rust-6284190ef9918e05cb9147a2a81100ddcb06fea8.zip | |
Merge branch 'master' into kmath
Conflicts: src/libcore/cmath.rs
Diffstat (limited to 'src/libstd/std.rc')
| -rw-r--r-- | src/libstd/std.rc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/libstd/std.rc b/src/libstd/std.rc index bcd2b82cf1a..8acb1ac9ef9 100644 --- a/src/libstd/std.rc +++ b/src/libstd/std.rc @@ -98,6 +98,13 @@ mod os; #[path = "posix_fs.rs"] mod os_fs; +#[cfg(target_os = "freebsd")] +#[path = "freebsd_os.rs"] +mod os; +#[cfg(target_os = "freebsd")] +#[path = "posix_fs.rs"] +mod os_fs; + // Local Variables: // mode: rust; // fill-column: 78; |