From 3c5a43e5b6f857c71c6f66dbbd640a47d34a0e7e Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Thu, 29 Aug 2013 14:20:48 -0700
Subject: Revert "auto merge of #8645 :
 alexcrichton/rust/issue-6436-run-non-blocking, r=brson"

This reverts commit b8d1fa399402c71331aefd634d710004e00b73a6, reversing
changes made to f22b4b169854c8a4ba86c16ee43327d6bcf94562.

Conflicts:
	mk/rt.mk
	src/libuv
---
 src/rt/rust_uv.cpp | 45 +++++++++------------------------------------
 1 file changed, 9 insertions(+), 36 deletions(-)

(limited to 'src/rt/rust_uv.cpp')

diff --git a/src/rt/rust_uv.cpp b/src/rt/rust_uv.cpp
index a181e76df5c..8ef4572f810 100644
--- a/src/rt/rust_uv.cpp
+++ b/src/rt/rust_uv.cpp
@@ -329,13 +329,20 @@ 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(int err) {
+rust_uv_strerror(uv_err_t* err_ptr) {
+    uv_err_t err = *err_ptr;
     return uv_strerror(err);
 }
 
 extern "C" const char*
-rust_uv_err_name(int err) {
+rust_uv_err_name(uv_err_t* err_ptr) {
+    uv_err_t err = *err_ptr;
     return uv_err_name(err);
 }
 
@@ -546,37 +553,3 @@ extern "C" uv_loop_t*
 rust_uv_get_loop_from_fs_req(uv_fs_t* req) {
   return req->loop;
 }
-extern "C" int
-rust_uv_spawn(uv_loop_t *loop, uv_process_t *p, uv_process_options_t options) {
-  return uv_spawn(loop, p, options);
-}
-
-extern "C" int
-rust_uv_process_kill(uv_process_t *p, int signum) {
-  return uv_process_kill(p, signum);
-}
-
-extern "C" void
-rust_set_stdio_container_flags(uv_stdio_container_t *c, int flags) {
-  c->flags = (uv_stdio_flags) flags;
-}
-
-extern "C" void
-rust_set_stdio_container_fd(uv_stdio_container_t *c, int fd) {
-  c->data.fd = fd;
-}
-
-extern "C" void
-rust_set_stdio_container_stream(uv_stdio_container_t *c, uv_stream_t *stream) {
-  c->data.stream = stream;
-}
-
-extern "C" int
-rust_uv_process_pid(uv_process_t* p) {
-  return p->pid;
-}
-
-extern "C" int
-rust_uv_pipe_init(uv_loop_t *loop, uv_pipe_t* p, int ipc) {
-  return uv_pipe_init(loop, p, ipc);
-}
-- 
cgit 1.4.1-3-g733a5