diff options
| author | Rickard Green <[email protected]> | 2015-03-21 14:35:24 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2015-03-21 14:35:24 +0100 |
| commit | c8859fae10da567e13a0090c6cc04f4de634dc73 (patch) | |
| tree | a933edfa62405fa11b09ede37f870d8d430c0b70 /erts/emulator/beam/erl_init.c | |
| parent | b99ce1c3a64f24e68b8a937338546fdf60501c65 (diff) | |
| parent | 50713b7d6179477d6018e6a9ca5610617e3de1fe (diff) | |
| download | otp-c8859fae10da567e13a0090c6cc04f4de634dc73.tar.gz otp-c8859fae10da567e13a0090c6cc04f4de634dc73.tar.bz2 otp-c8859fae10da567e13a0090c6cc04f4de634dc73.zip | |
Merge branch 'rickard/time_api/OTP-11997'
* rickard/time_api/OTP-11997:
Unbreak lcnt
Diffstat (limited to 'erts/emulator/beam/erl_init.c')
| -rw-r--r-- | erts/emulator/beam/erl_init.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_init.c b/erts/emulator/beam/erl_init.c index 5aeb5b2590..86d3416423 100644 --- a/erts/emulator/beam/erl_init.c +++ b/erts/emulator/beam/erl_init.c @@ -1171,7 +1171,6 @@ early_init(int *argc, char **argv) /* /* Creates threads on Windows that depend on the arguments, so has to be after erl_sys_args */ erl_sys_init(); - erts_early_init_time_sup(); erts_ets_realloc_always_moves = 0; erts_ets_always_compress = 0; |