diff options
| author | Brian Anderson <banderson@mozilla.com> | 2013-07-08 16:20:38 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2013-07-08 16:29:54 -0700 |
| commit | fae33367692c634356d861dc4badb967dc72a573 (patch) | |
| tree | d73190f2523bed7d010da69442b0c28973631ac1 /src/rt/rust_uv.cpp | |
| parent | b227583dadd1500bba7752c7e5d9f2ac931611bc (diff) | |
| parent | f503e539bf60416a731f9ecc12b6aab31ef2fe87 (diff) | |
| download | rust-fae33367692c634356d861dc4badb967dc72a573.tar.gz rust-fae33367692c634356d861dc4badb967dc72a573.zip | |
Merge remote-tracking branch 'mozilla/master'
Conflicts: src/libextra/test.rs src/libstd/rt/global_heap.rs src/libstd/unstable/lang.rs src/libstd/vec.rs
Diffstat (limited to 'src/rt/rust_uv.cpp')
| -rw-r--r-- | src/rt/rust_uv.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/rt/rust_uv.cpp b/src/rt/rust_uv.cpp index 32ccc9ba4a8..95e38a9903c 100644 --- a/src/rt/rust_uv.cpp +++ b/src/rt/rust_uv.cpp @@ -13,10 +13,11 @@ #include <malloc.h> #endif +#include "uv.h" + #include "rust_globals.h" #include "rust_task.h" #include "rust_log.h" -#include "uv.h" // extern fn pointers typedef void (*extern_async_op_cb)(uv_loop_t* loop, void* data, |