diff options
| author | Dan Gudmundsson <[email protected]> | 2012-02-28 12:26:28 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2012-02-28 12:26:28 +0100 |
| commit | 12bbb4aea95bbf0258075f79308f8539859fe6d5 (patch) | |
| tree | a81c7cc440b7b50806270afd2e48aef35a812c8e /lib/wx/src/wxe_master.erl | |
| parent | c56a89474b95f5460cc7add09f0258815596e1ac (diff) | |
| parent | f06de6450bbbd324a0784780d892fa69908a2126 (diff) | |
| download | otp-12bbb4aea95bbf0258075f79308f8539859fe6d5.tar.gz otp-12bbb4aea95bbf0258075f79308f8539859fe6d5.tar.bz2 otp-12bbb4aea95bbf0258075f79308f8539859fe6d5.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/wx/src/wxe_master.erl')
| -rw-r--r-- | lib/wx/src/wxe_master.erl | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/lib/wx/src/wxe_master.erl b/lib/wx/src/wxe_master.erl index 9efe59054c..ac6e4a56e6 100644 --- a/lib/wx/src/wxe_master.erl +++ b/lib/wx/src/wxe_master.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2011. All Rights Reserved. +%% Copyright Ericsson AB 2008-2012. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -100,17 +100,10 @@ init([]) -> case catch erlang:system_info(smp_support) of true -> ok; _ -> - error_logger:format("WX ERROR: SMP emulator required", []), + error_logger:format("WX ERROR: SMP emulator required (start with erl -smp)", []), erlang:error(not_smp) end, - case catch (erlang:system_info(version) >= "5.6.2") of - true -> ok; - _ -> %% Needs to be able to disable FPU exceptions. - error_logger:format("WX ERROR: OTP R12B-2 or Emulator >= 5.6.2 required", []), - erlang:error(wrong_version) - end, - %% io:format("Loading ~p @ ~p ~n", [DriverName,PrivDir]), case os:type() of {win32,_} -> %% Needed for mingwm10.dll Path = os:getenv("PATH"), |