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/kernel/src | |
| 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/kernel/src')
| -rw-r--r-- | lib/kernel/src/inet_config.erl | 3 | ||||
| -rw-r--r-- | lib/kernel/src/os.erl | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/lib/kernel/src/inet_config.erl b/lib/kernel/src/inet_config.erl index 803fae846e..a0d5344f11 100644 --- a/lib/kernel/src/inet_config.erl +++ b/lib/kernel/src/inet_config.erl @@ -188,9 +188,6 @@ do_load_resolv({win32,Type}, longnames) -> win32_load_from_registry(Type), inet_db:set_lookup([native]); -do_load_resolv({ose,_}, _) -> - inet_db:set_lookup([file]); - do_load_resolv(_, _) -> inet_db:set_lookup([native]). diff --git a/lib/kernel/src/os.erl b/lib/kernel/src/os.erl index 3330b38d84..ffb899e5ca 100644 --- a/lib/kernel/src/os.erl +++ b/lib/kernel/src/os.erl @@ -93,7 +93,7 @@ unsetenv(_) -> %%% End of BIFs -spec type() -> {Osfamily, Osname} when - Osfamily :: unix | win32 | ose, + Osfamily :: unix | win32, Osname :: atom(). type() -> |