about summary refs log tree commit diff
path: root/src/rt/rust_uv.cpp
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2013-08-18 17:11:45 -0700
committerAlex Crichton <alex@alexcrichton.com>2013-08-27 20:46:17 -0700
commited204257a0c6abc8386879bb631471ec17d8a96a (patch)
tree72e84f91fd63865d0443c0a0e9c46fa9d2ffbbbc /src/rt/rust_uv.cpp
parent578e68047736167239c52fa1aba0347011ff1bc3 (diff)
downloadrust-ed204257a0c6abc8386879bb631471ec17d8a96a.tar.gz
rust-ed204257a0c6abc8386879bb631471ec17d8a96a.zip
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/rust_uv.cpp')
-rw-r--r--src/rt/rust_uv.cpp11
1 files changed, 2 insertions, 9 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);
 }