diff options
| author | Rickard Green <[email protected]> | 2019-03-19 13:22:47 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2019-03-19 13:22:47 +0100 |
| commit | ef67e6a44cf1c87b8221cb652995b82ea1c9e728 (patch) | |
| tree | 45438da8aa3dda125c4eee6efb3e8f5a61e84dff /lib/erl_interface/src/prog/erl_start.c | |
| parent | dbe7c4610f030997b9c22b3d5a06628933acc6e0 (diff) | |
| parent | 543ca376a922c6dbe34e2207c4c512c5f6b5d624 (diff) | |
| download | otp-ef67e6a44cf1c87b8221cb652995b82ea1c9e728.tar.gz otp-ef67e6a44cf1c87b8221cb652995b82ea1c9e728.tar.bz2 otp-ef67e6a44cf1c87b8221cb652995b82ea1c9e728.zip | |
Merge branch 'rickard/erl_call/ERL-881/OTP-15676' into maint
* 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--; } |