diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2013-08-18 17:11:45 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2013-08-27 20:46:17 -0700 |
| commit | ed204257a0c6abc8386879bb631471ec17d8a96a (patch) | |
| tree | 72e84f91fd63865d0443c0a0e9c46fa9d2ffbbbc /src/rt | |
| parent | 578e68047736167239c52fa1aba0347011ff1bc3 (diff) | |
Upgrade libuv to the current master + our patches
There were two main differences with the old libuv and the master version: 1. The uv_last_error function is now gone. The error code returned by each function is the "last error" so now a UvError is just a wrapper around a c_int. 2. The repo no longer includes a makefile, and the build system has change. According to the build directions on joyent/libuv, this now downloads a `gyp` program into the `libuv/build` directory and builds using that. This shouldn't add any dependences on autotools or anything like that. Closes #8407 Closes #6567 Closes #6315
Diffstat (limited to 'src/rt')
| -rw-r--r-- | src/rt/rust_uv.cpp | 11 | ||||
| -rw-r--r-- | src/rt/rustrt.def.in | 3 |
2 files changed, 3 insertions, 11 deletions
diff --git a/src/rt/rust_uv.cpp b/src/rt/rust_uv.cpp index 8ef4572f810..23b97a43655 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 b668d394406..edc9f494615 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 @@ -191,4 +190,4 @@ rust_drop_global_args_lock rust_take_change_dir_lock rust_drop_change_dir_lock rust_get_test_int -rust_get_task \ No newline at end of file +rust_get_task |