diff options
| author | Erlang/OTP <[email protected]> | 2019-03-18 18:02:31 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2019-03-18 18:02:31 +0100 |
| commit | d4266651c5662c3b6addcea291bc6bffffbb7fb5 (patch) | |
| tree | 53702fc58bf4ebabe917f673293070d341ed8d18 /lib/erl_interface/src/prog/erl_start.c | |
| parent | 620ac3e68c5bc8b36143965fcf2892a07dc005c4 (diff) | |
| parent | 543ca376a922c6dbe34e2207c4c512c5f6b5d624 (diff) | |
| download | otp-d4266651c5662c3b6addcea291bc6bffffbb7fb5.tar.gz otp-d4266651c5662c3b6addcea291bc6bffffbb7fb5.tar.bz2 otp-d4266651c5662c3b6addcea291bc6bffffbb7fb5.zip | |
Merge branch 'rickard/erl_call/ERL-881/OTP-15676' into maint-21
* rickard/erl_call/ERL-881/OTP-15676:
Add smoke test for erl_call
Add new api functions to ei_fake_prog
Fix timeout value when waiting for emulator start
Fix initialization of erl_call
Diffstat (limited to 'lib/erl_interface/src/prog/erl_start.c')
| -rw-r--r-- | lib/erl_interface/src/prog/erl_start.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/erl_interface/src/prog/erl_start.c b/lib/erl_interface/src/prog/erl_start.c index 670a5900c9..c766f4780e 100644 --- a/lib/erl_interface/src/prog/erl_start.c +++ b/lib/erl_interface/src/prog/erl_start.c @@ -657,7 +657,7 @@ static int wait_for_erlang(int sockd, int magic, struct timeval *timeout) gettimeofday(&now,NULL); to.tv_sec = stop_time.tv_sec - now.tv_sec; to.tv_usec = stop_time.tv_usec - now.tv_usec; - while ((to.tv_usec <= 0) && (to.tv_sec >= 0)) { + while ((to.tv_usec < 0) && (to.tv_sec > 0)) { to.tv_usec += 1000000; to.tv_sec--; } |