fix #2446, fix #1689, fix libuv #5. bump version of libuv to latest o…

…rigin/master from upstream
JuliaLang · Mar 7, 2013 · 32f365d · 32f365d
1 parent fddb947
commit 32f365d
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 10 deletions.
diff --git 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
diff --git 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
@@ -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
@@ -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;