aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErland Schönbeck <[email protected]>2015-05-05 07:47:45 +0200
committerErland Schönbeck <[email protected]>2015-05-05 07:47:45 +0200
commit727338fe38bb9aae0ea4d9069d8a1d6e1694a2dd (patch)
treefa4c9687569e655eac4811434417f9b9387dd2c5
parent5f9149af479edcd4c27bdae751b7ab3f00dfa684 (diff)
parentb999f25cbbe37555e5b8a1d09b8fca3960309cde (diff)
downloadotp-727338fe38bb9aae0ea4d9069d8a1d6e1694a2dd.tar.gz
otp-727338fe38bb9aae0ea4d9069d8a1d6e1694a2dd.tar.bz2
otp-727338fe38bb9aae0ea4d9069d8a1d6e1694a2dd.zip
Merge branch 'erland/OTP18/inets/time_dialyzer/OTP-12441'
* erland/OTP18/inets/time_dialyzer/OTP-12441: inets: Remove dialyzer warning for inets_lib
-rw-r--r--lib/inets/src/inets_app/inets_lib.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/inets/src/inets_app/inets_lib.erl b/lib/inets/src/inets_app/inets_lib.erl
index e79959f678..fa6adaebd0 100644
--- a/lib/inets/src/inets_app/inets_lib.erl
+++ b/lib/inets/src/inets_app/inets_lib.erl
@@ -26,7 +26,7 @@
%% Help function, elapsed milliseconds since T0
millisec_passed({_,_,_} = T0 ) ->
%% OTP 17 and earlier
- timer:now_diff(inets_time_compat:monotonic_time(), T0) div 1000;
+ timer:now_diff(inets_time_compat:timestamp(), T0) div 1000;
millisec_passed(T0) ->
%% OTP 18