Skip to content

Commit 1191032

Browse files
vtjnashJeffBezanson
authored andcommitted
fix #2446, fix #1689, fix libuv #5. bump version of libuv to latest origin/master from upstream
1 parent fe1f8e0 commit 1191032

File tree

5 files changed

+5
-10
lines changed

5 files changed

+5
-10
lines changed

deps/Makefile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -377,9 +377,6 @@ $(UV_OBJ_SOURCE): $(JULIAHOME)/.git/modules/deps/libuv/HEAD
377377
endif
378378
LIBUV_MAKE_FLAGS = -C libuv CC="$(CC)" AR="$(AR)" uname_S=$(uname_S)
379379
$(UV_OBJ_SOURCE): libuv/Makefile
380-
ifneq ($(OS), WINNT)
381-
$(MAKE) libuv.${SHLIB_EXT} $(LIBUV_MAKE_FLAGS)
382-
endif
383380
$(MAKE) libuv.a $(LIBUV_MAKE_FLAGS)
384381
touch -c $@
385382
libuv/checked: $(LIBUV_OBJ_SOURCE)

deps/libuv

Submodule libuv updated 153 files

src/init.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ DLLEXPORT void uv_atexit_hook()
286286
}
287287
item = item->next;
288288
}
289-
uv_run(loop); //let libuv spin until everything has finished closing
289+
uv_run(loop,UV_RUN_DEFAULT); //let libuv spin until everything has finished closing
290290
}
291291

292292
void jl_get_builtin_hooks(void);

src/wrapper.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -222,14 +222,12 @@ DLLEXPORT uv_tcp_t *jl_make_tcp(uv_loop_t* loop, jl_value_t *julia_struct)
222222

223223
DLLEXPORT void jl_run_event_loop(uv_loop_t *loop)
224224
{
225-
restore_signals();
226-
if (loop) uv_run(loop);
225+
if (loop) uv_run(loop,UV_RUN_DEFAULT);
227226
}
228227

229228
DLLEXPORT void jl_process_events(uv_loop_t *loop)
230229
{
231-
restore_signals();
232-
if (loop) uv_run_once(loop);
230+
if (loop) uv_run(loop,UV_RUN_NOWAIT);
233231
}
234232

235233
DLLEXPORT uv_pipe_t *jl_init_pipe(uv_pipe_t *pipe, int writable, int julia_only, jl_value_t *julia_struct)

ui/repl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ int true_main(int argc, char *argv[])
277277
jl_printf(JL_STDERR, "\n\n");
278278
iserr = 0;
279279
}
280-
uv_run(jl_global_event_loop());
280+
uv_run(jl_global_event_loop(),UV_RUN_DEFAULT);
281281
}
282282
JL_CATCH {
283283
iserr = 1;

0 commit comments

Comments
 (0)