Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fix merge issues

  • Loading branch information...
commit 8026a710c34850f0218260703c1456a408fe78f6 1 parent 2dda114
@Keno authored
View
2  Make.inc
@@ -264,7 +264,7 @@ INSTALL_NAME_CMD = install_name_tool -id $(INSTALL_NAME_ID_DIR)
INSTALL_NAME_CHANGE_CMD = install_name_tool -change
RPATH = -Wl,-rpath,'@executable_path/../$(JL_LIBDIR)' -Wl,-rpath,'@executable_path/../$(JL_PRIVATE_LIBDIR)'
SHLIB_EXT = dylib
-OSLIBS += -ldl -Wl,-w -framework ApplicationServices
+OSLIBS += -ldl -Wl,-w -framework CoreFoundation -framework CoreServices
WHOLE_ARCHIVE = -Xlinker -all_load
NO_WHOLE_ARCHIVE =
JLDFLAGS =
View
15 base/client.jl
@@ -1,9 +1,6 @@
## client.jl - frontend handling command line options, environment setup,
## and REPL
-@unix_only _jl_repl = _jl_lib
-@windows_only _jl_repl = ccall(:GetModuleHandleA,stdcall,Ptr{Void},(Ptr{Void},),C_NULL)
-
const _jl_color_normal = "\033[0m"
function _jl_answer_color()
@@ -71,7 +68,7 @@ function _jl_eval_user_input(ast::ANY, show_value)
iserr, lasterr, bt = false, (), nothing
while true
try
- ccall(:jl_register_toplevel_eh, Void, ())
+ #ccall(:jl_register_toplevel_eh, Void, ())
ccall(:restore_signals, Void, ())
if _jl_have_color
print(_jl_color_normal)
@@ -124,7 +121,7 @@ function readBuffer(stream::TTY, nread)
end
ptr = pointer(stream.buffer.data,stream.buffer.ptr)
skip(stream.buffer,nread)
- ccall(dlsym(_jl_repl,:jl_readBuffer),Void,(Ptr{Void},Int32),ptr,nread)
+ ccall(:jl_readBuffer,Void,(Ptr{Void},Int32),ptr,nread)
end
return false
end
@@ -133,7 +130,7 @@ function run_repl()
global const _jl_repl_channel = RemoteRef()
if _jl_have_color
- ccall(dlsym(_jl_repl,:jl_enable_color), Void, ())
+ ccall(:jl_enable_color, Void, ())
end
atexit() do
if _jl_have_color
@@ -143,7 +140,7 @@ function run_repl()
end
while true
- ccall(dlsym(_jl_repl,:repl_callback_enable), Void, ())
+ ccall(:repl_callback_enable, Void, ())
global _repl_enough_stdin = false
start_reading(STDIN, readBuffer)
(ast, show_value) = take(_jl_repl_channel)
@@ -256,7 +253,7 @@ julia_pkgdir() = abs_path(get(ENV,"JULIA_PKGDIR",string(ENV["HOME"],"/.julia")))
function _start()
# set up standard streams
-
+ reinit_stdio()
librandom_init()
# set CPU core count
@@ -264,7 +261,7 @@ function _start()
#atexit(()->flush(stdout_stream))
try
- ccall(:jl_register_toplevel_eh, Void, ())
+ #ccall(:jl_register_toplevel_eh, Void, ())
global const Workqueue = WorkItem[]
global const Waiting = Dict(64)
View
11 base/multi.jl
@@ -648,7 +648,7 @@ end
function perform_work(job::WorkItem)
local result
try
- ccall(:jl_register_toplevel_eh, Void, ())
+ #ccall(:jl_register_toplevel_eh, Void, ())
if isa(job.task,Task)
# continuing interrupted work item
arg = job.argument
@@ -1404,7 +1404,7 @@ function event_loop(isclient)
iserr, lasterr = false, ()
while true
try
- ccall(:jl_register_toplevel_eh, Void, ())
+ #ccall(:jl_register_toplevel_eh, Void, ())
if iserr
show(lasterr)
iserr, lasterr = false, ()
@@ -1412,19 +1412,18 @@ function event_loop(isclient)
run_event_loop();
end
catch backtrace
- e = backtrace.e
if isa(e,DisconnectException)
# TODO: wake up tasks waiting for failed process
if !isclient
return
end
- elseif isclient && isa(e,InterruptException)
+ elseif isclient && isa(e,InterruptException) &&
+ !has(_jl_fd_handlers, STDIN.fd)
# root task is waiting for something on client. allow C-C
# to interrupt.
interrupt_waiting_task(_jl_roottask_wi, e)
- continue
end
- iserr, lasterr = true, backtrace
+ iserr, lasterr = true, e
end
end
end
View
4 base/sysimg.jl
@@ -2,7 +2,7 @@ baremodule Base
eval(x) = Core.eval(Base,x)
eval(m,x) = Core.eval(m,x)
-ccall(:jl_load_progress_setmax, Void, (Int,), 72)
+#ccall(:jl_load_progress_setmax, Void, (Int,), 72)
include("export.jl")
if false
@@ -279,7 +279,7 @@ end # baremodule Base
using Base
-JL_PRIVATE_LIBDIR = getenv("JL_PRIVATE_LIBDIR")
+let JL_PRIVATE_LIBDIR = getenv("JL_PRIVATE_LIBDIR")
# create system image file
ccall(:jl_save_system_image, Void, (Ptr{Uint8},),
"$JULIA_HOME/../$JL_PRIVATE_LIBDIR/sys.ji")
View
15 src/ccall.cpp
@@ -289,15 +289,18 @@ static Value *emit_ccall(jl_value_t **args, size_t nargs, jl_codectx_t *ctx)
if (f_name != NULL) {
// just symbol, default to JuliaDLHandle
#ifdef __WIN32__
- fptr = jl_dlsym_e(jl_dl_handle, f_name);
- if (!fptr) {
- fptr = jl_dlsym_e(jl_kernel32_handle, f_name);
+ fptr = jl_dlsym_e(jl_exe_handle, f_name);
+ if(!fptr) {
+ fptr = jl_dlsym_e(jl_dl_handle, f_name);
if (!fptr) {
- fptr = jl_dlsym_e(jl_ntdll_handle, f_name);
+ fptr = jl_dlsym_e(jl_kernel32_handle, f_name);
if (!fptr) {
- fptr = jl_dlsym_e(jl_crtdll_handle, f_name);
+ fptr = jl_dlsym_e(jl_ntdll_handle, f_name);
if (!fptr) {
- fptr = jl_dlsym(jl_winsock_handle, f_name);
+ fptr = jl_dlsym_e(jl_crtdll_handle, f_name);
+ if (!fptr) {
+ fptr = jl_dlsym(jl_winsock_handle, f_name);
+ }
}
}
}
View
3  src/init.c
@@ -263,11 +263,13 @@ void jl_get_builtin_hooks(void);
uv_lib_t *jl_dl_handle;
#ifdef __WIN32__
uv_lib_t _jl_ntdll_handle;
+uv_lib_t _jl_exe_handle;
uv_lib_t _jl_kernel32_handle;
uv_lib_t _jl_crtdll_handle;
uv_lib_t _jl_winsock_handle;
uv_lib_t *jl_ntdll_handle=&_jl_ntdll_handle;
+uv_lib_t *jl_exe_handle=&_jl_exe_handle;
uv_lib_t *jl_kernel32_handle=&_jl_kernel32_handle;
uv_lib_t *jl_crtdll_handle=&_jl_crtdll_handle;
uv_lib_t *jl_winsock_handle=&_jl_winsock_handle;
@@ -343,6 +345,7 @@ void julia_init(char *imageFile)
uv_dlopen("Kernel32.dll",jl_kernel32_handle);
uv_dlopen("msvcrt.dll",jl_crtdll_handle);
uv_dlopen("Ws2_32.dll",jl_winsock_handle);
+ jl_exe_handle = GetModuleHandleA(NULL);
#endif
jl_io_loop = uv_default_loop(); //this loop will internal events (spawining process etc.)
init_stdio();
View
1  src/julia.h
@@ -438,6 +438,7 @@ extern jl_function_t *jl_bottom_func;
extern uv_lib_t *jl_dl_handle;
#if defined(__WIN32__) || defined (_WIN32)
extern uv_lib_t *jl_ntdll_handle;
+extern uv_lib_t *jl_exe_handle;
extern uv_lib_t *jl_kernel32_handle;
extern uv_lib_t *jl_crtdll_handle;
extern uv_lib_t *jl_winsock_handle;
View
2  src/module.c
@@ -127,7 +127,7 @@ static void module_import_(jl_module_t *to, jl_module_t *from, jl_sym_t *s,
if (to == from)
return;
jl_binding_t *b = jl_get_binding(from, s);
- if (b == NULL || !b->exportp) {
+ if (b == NULL) {
jl_printf(JL_STDERR,
"Warning: could not import %s.%s into %s\n",
from->name->name, s->name, to->name->name);
View
1  src/support/ios.h
@@ -11,7 +11,6 @@
//make it compatible with UV Handles
typedef enum { bm_none=UV_HANDLE_TYPE_MAX+1, bm_line, bm_block, bm_mem } bufmode_t;
-
typedef enum { bst_none, bst_rd, bst_wr } bufstate_t;
#define IOS_INLSIZE 54
Please sign in to comment.
Something went wrong with that request. Please try again.