diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2013-08-18 17:11:45 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2013-09-06 11:12:49 -0700 |
| commit | b4c36c2d1b8079cdb14bd3bf85c1ffc43f1f1d15 (patch) | |
| tree | ceec36b952fe9b00f2c77c71e2f15fe8d058bafe /src/rt | |
| parent | d39cec65b025ad4c6de50e778ffd1177279b5b3d (diff) | |
| download | rust-b4c36c2d1b8079cdb14bd3bf85c1ffc43f1f1d15.tar.gz rust-b4c36c2d1b8079cdb14bd3bf85c1ffc43f1f1d15.zip | |
Upgrade libuv to the current master (again)
This is a reopening of the libuv-upgrade part of #8645. Hopefully this won't cause random segfaults all over the place. The windows regression in testing should also be fixed (it shouldn't build the whole compiler twice). A notable difference from before is that gyp is now a git submodule instead of always git-cloned at make time. This allows bundling for releases more easily. Closes #8850
Diffstat (limited to 'src/rt')
| -rw-r--r-- | src/rt/rust_uv.cpp | 11 | ||||
| -rw-r--r-- | src/rt/rustrt.def.in | 1 |
2 files changed, 2 insertions, 10 deletions
diff --git a/src/rt/rust_uv.cpp b/src/rt/rust_uv.cpp index ac5ea4bb3b3..bfdf0e67a9b 100644 --- a/src/rt/rust_uv.cpp +++ b/src/rt/rust_uv.cpp @@ -329,20 +329,13 @@ rust_uv_get_len_from_buf(uv_buf_t buf) { return buf.len; } -extern "C" uv_err_t -rust_uv_last_error(uv_loop_t* loop) { - return uv_last_error(loop); -} - extern "C" const char* -rust_uv_strerror(uv_err_t* err_ptr) { - uv_err_t err = *err_ptr; +rust_uv_strerror(int err) { return uv_strerror(err); } extern "C" const char* -rust_uv_err_name(uv_err_t* err_ptr) { - uv_err_t err = *err_ptr; +rust_uv_err_name(int err) { return uv_err_name(err); } diff --git a/src/rt/rustrt.def.in b/src/rt/rustrt.def.in index 45109443f06..bf3500e4c72 100644 --- a/src/rt/rustrt.def.in +++ b/src/rt/rustrt.def.in @@ -47,7 +47,6 @@ rust_uv_timer_start rust_uv_timer_stop rust_uv_tcp_init rust_uv_buf_init -rust_uv_last_error rust_uv_strerror rust_uv_err_name rust_uv_ip4_addr |
