diff options
author | Lukas Larsson <[email protected]> | 2015-07-14 16:37:41 +0200 |
---|---|---|
committer | Lukas Larsson <[email protected]> | 2015-07-14 16:37:41 +0200 |
commit | 6cf4260ae1604cdb20ad7782d8a491edcc3310e7 (patch) | |
tree | 226ccae99a48f4dd4d27a014b62798cefe501947 /lib/hipe | |
parent | 31623a16629dee45e3d3e6f33ffb0865b157301a (diff) | |
parent | d2a0690865339a2d37badc4b79025f97b34e3d46 (diff) | |
download | otp-6cf4260ae1604cdb20ad7782d8a491edcc3310e7.tar.gz otp-6cf4260ae1604cdb20ad7782d8a491edcc3310e7.tar.bz2 otp-6cf4260ae1604cdb20ad7782d8a491edcc3310e7.zip |
Merge branch 'lukas/ose/remove/OTP-12573'
* lukas/ose/remove/OTP-12573:
Remove OSE from erl_interface
ose: Remove all code related to the OSE port
Diffstat (limited to 'lib/hipe')
-rw-r--r-- | lib/hipe/cerl/erl_bif_types.erl | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/hipe/cerl/erl_bif_types.erl b/lib/hipe/cerl/erl_bif_types.erl index 41a6c731c9..0b033ca439 100644 --- a/lib/hipe/cerl/erl_bif_types.erl +++ b/lib/hipe/cerl/erl_bif_types.erl @@ -913,8 +913,7 @@ type(erlang, system_info, 1, Xs, Opaques) -> t_list(t_pid()); ['os_type'] -> t_tuple([t_sup([t_atom('unix'), - t_atom('win32'), - t_atom('ose')]), + t_atom('win32')]), t_atom()]); ['os_version'] -> t_sup(t_tuple([t_non_neg_fixnum(), |