diff options
| author | John Högberg <[email protected]> | 2018-01-08 09:28:03 +0100 |
|---|---|---|
| committer | John Högberg <[email protected]> | 2018-01-08 09:28:03 +0100 |
| commit | 68a0f569410f7375c44a9d806930b1172c1d92a8 (patch) | |
| tree | 4c2f6d8714613a068b74d115b5e8e725161f885b /erts/emulator/beam/bif.tab | |
| parent | e2367ba51d0cc0cb4a65fd39d1a8b7bd943efe8e (diff) | |
| parent | 185a0cdc2d0f72d64768dc6dd5465ad6fe561028 (diff) | |
| download | otp-68a0f569410f7375c44a9d806930b1172c1d92a8.tar.gz otp-68a0f569410f7375c44a9d806930b1172c1d92a8.tar.bz2 otp-68a0f569410f7375c44a9d806930b1172c1d92a8.zip | |
Merge branch 'john/erts/putenv-thread-safety/OTP-14666'
Diffstat (limited to 'erts/emulator/beam/bif.tab')
| -rw-r--r-- | erts/emulator/beam/bif.tab | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/erts/emulator/beam/bif.tab b/erts/emulator/beam/bif.tab index 33f6eef652..c0d5e8ce74 100644 --- a/erts/emulator/beam/bif.tab +++ b/erts/emulator/beam/bif.tab @@ -376,9 +376,10 @@ bif ets:match_spec_run_r/3 # Bifs in os module. # -bif os:putenv/2 -bif os:getenv/0 -bif os:getenv/1 +bif os:get_env_var/1 +bif os:set_env_var/2 +bif os:unset_env_var/1 +bif os:list_env_vars/0 bif os:getpid/0 bif os:timestamp/0 bif os:system_time/0 @@ -619,7 +620,6 @@ bif erlang:float_to_binary/2 bif erlang:binary_to_float/1 bif io:printable_range/0 -bif os:unsetenv/1 # # New in 17.0 |