From 32f365d1ad78bf98d507e401ad7073e9d0466045 Mon Sep 17 00:00:00 2001
From: Jameson Nash <vtjnash@gmail.com>
Date: Wed, 6 Mar 2013 21:16:03 -0500
Subject: [PATCH] fix #2446, fix #1689, fix libuv #5. bump version of libuv to
 latest origin/master from upstream

---
 deps/Makefile | 3 ---
 deps/libuv    | 2 +-
 src/init.c    | 2 +-
 src/jl_uv.c   | 6 ++----
 ui/repl.c     | 2 +-
 5 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/deps/Makefile b/deps/Makefile
index 4a421805fcc48..75174b0a4247c 100644
--- a/deps/Makefile
+++ b/deps/Makefile
@@ -373,9 +373,6 @@ $(UV_OBJ_SOURCE): $(JULIAHOME)/.git/modules/deps/libuv/HEAD
 endif
 LIBUV_MAKE_FLAGS = -C libuv CC="$(CC)" AR="$(AR)" uname_S=$(uname_S)
 $(UV_OBJ_SOURCE): libuv/Makefile
-ifneq ($(OS), WINNT)
-	$(MAKE) libuv.${SHLIB_EXT} $(LIBUV_MAKE_FLAGS)
-endif
 	$(MAKE) libuv.a $(LIBUV_MAKE_FLAGS)
 	touch -c $@
 libuv/checked: $(LIBUV_OBJ_SOURCE)
diff --git a/deps/libuv b/deps/libuv
index 3c6bef3aa86c8..f22ec826f797b 160000
--- a/deps/libuv
+++ b/deps/libuv
@@ -1 +1 @@
-Subproject commit 3c6bef3aa86c8c5bf380bd6cf5b6a45688a102e6
+Subproject commit f22ec826f797bfc307718521bdf6ea0725251237
diff --git a/src/init.c b/src/init.c
index 61f4897f60593..4dcd6b3c4124c 100644
--- a/src/init.c
+++ b/src/init.c
@@ -328,7 +328,7 @@ DLLEXPORT void uv_atexit_hook()
         }
         item = item->next;
     }
-    uv_run(loop); //let libuv spin until everything has finished closing
+    uv_run(loop,UV_RUN_DEFAULT); //let libuv spin until everything has finished closing
 }
 
 void jl_get_builtin_hooks(void);
diff --git a/src/jl_uv.c b/src/jl_uv.c
index 1ac61686ef3e7..437c5d61b8cd0 100644
--- a/src/jl_uv.c
+++ b/src/jl_uv.c
@@ -222,14 +222,12 @@ DLLEXPORT uv_tcp_t *jl_make_tcp(uv_loop_t* loop, jl_value_t *julia_struct)
 
 DLLEXPORT void jl_run_event_loop(uv_loop_t *loop)
 {
-    restore_signals();
-    if (loop) uv_run(loop);
+    if (loop) uv_run(loop,UV_RUN_DEFAULT);
 }
 
 DLLEXPORT void jl_process_events(uv_loop_t *loop)
 {
-    restore_signals();
-    if (loop) uv_run_once(loop);
+    if (loop) uv_run(loop,UV_RUN_NOWAIT);
 }
 
 DLLEXPORT uv_pipe_t *jl_init_pipe(uv_pipe_t *pipe, int writable, int julia_only, jl_value_t *julia_struct)
diff --git a/ui/repl.c b/ui/repl.c
index bcc4441c4cc5c..f4bb80f80b3b5 100644
--- a/ui/repl.c
+++ b/ui/repl.c
@@ -277,7 +277,7 @@ int true_main(int argc, char *argv[])
             jl_printf(JL_STDERR, "\n\n");
             iserr = 0;
         }
-    uv_run(jl_global_event_loop());
+    uv_run(jl_global_event_loop(),UV_RUN_DEFAULT);
     }
     JL_CATCH {
         iserr = 1;