diff options
author | Dan Gudmundsson <[email protected]> | 2018-01-22 12:04:26 +0100 |
---|---|---|
committer | Dan Gudmundsson <[email protected]> | 2018-01-22 12:04:26 +0100 |
commit | d51c21fca9a4af46b9322b1425ed0a29ed50fd77 (patch) | |
tree | 5a92bb052bc81289b9c86d0804299df50f09d05f /lib/wx/src/wxe_master.erl | |
parent | 68a0f569410f7375c44a9d806930b1172c1d92a8 (diff) | |
download | otp-d51c21fca9a4af46b9322b1425ed0a29ed50fd77.tar.gz otp-d51c21fca9a4af46b9322b1425ed0a29ed50fd77.tar.bz2 otp-d51c21fca9a4af46b9322b1425ed0a29ed50fd77.zip |
wx: open_port doesn't allow 0 terminated strings anymore
Fix getenv usage.
And remove set path it is automagically done by driver interface.
Diffstat (limited to 'lib/wx/src/wxe_master.erl')
-rw-r--r-- | lib/wx/src/wxe_master.erl | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/lib/wx/src/wxe_master.erl b/lib/wx/src/wxe_master.erl index ce859b3eb3..a55917f0aa 100644 --- a/lib/wx/src/wxe_master.erl +++ b/lib/wx/src/wxe_master.erl @@ -122,16 +122,9 @@ init([SilentStart]) -> erlang:error(not_smp) end, - case os:type() of - {win32,_} -> %% Needed for mingwm10.dll - Path = os:getenv("PATH"), - os:putenv("PATH", PrivDir ++ ";" ++ Path); - _ -> ok - end, - case erl_ddll:load_driver(PrivDir,DriverName) of ok -> ok; - {error, What} -> + {error, What} -> wxe_util:opt_error_log(SilentStart, "WX Failed loading ~p@~p ~n", [DriverName,PrivDir]), @@ -139,8 +132,8 @@ init([SilentStart]) -> erlang:error({load_driver,Str}) end, process_flag(trap_exit, true), - DriverWithArgs = DriverName ++ " " ++ code:priv_dir(wx) ++ [0], - + DriverWithArgs = DriverName ++ " " ++ code:priv_dir(wx), + try Port = open_port({spawn, DriverWithArgs},[binary]), wx_debug_info = ets:new(wx_debug_info, [named_table]), |