aboutsummaryrefslogtreecommitdiffstats
path: root/lib/megaco/src
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2015-05-26 13:37:13 +0200
committerBjörn Gustavsson <[email protected]>2015-05-27 12:17:43 +0200
commit3650d333cb06547b8b05ca90d08922a49f919cc6 (patch)
tree44f4f7865f4303460f657b577273fda2c85f7c08 /lib/megaco/src
parent2925fbba49237ff6b6e2691f52c4afb2c0447e46 (diff)
downloadotp-3650d333cb06547b8b05ca90d08922a49f919cc6.tar.gz
otp-3650d333cb06547b8b05ca90d08922a49f919cc6.tar.bz2
otp-3650d333cb06547b8b05ca90d08922a49f919cc6.zip
megaco: Eliminate use of erlang:now/0
Diffstat (limited to 'lib/megaco/src')
-rw-r--r--lib/megaco/src/app/megaco.app.src2
-rw-r--r--lib/megaco/src/app/megaco.appup.src4
-rw-r--r--lib/megaco/src/engine/megaco_trans_sender.erl3
3 files changed, 4 insertions, 5 deletions
diff --git a/lib/megaco/src/app/megaco.app.src b/lib/megaco/src/app/megaco.app.src
index 3720b1109e..573b1857f6 100644
--- a/lib/megaco/src/app/megaco.app.src
+++ b/lib/megaco/src/app/megaco.app.src
@@ -114,7 +114,7 @@
{env, []},
{mod, {megaco_sup, []}},
{runtime_dependencies, ["stdlib-2.5","runtime_tools-1.8.14","kernel-3.0",
- "et-1.5","erts-6.0","debugger-4.0",
+ "et-1.5","erts-7.0","debugger-4.0",
"asn1-3.0"]}
]}.
diff --git a/lib/megaco/src/app/megaco.appup.src b/lib/megaco/src/app/megaco.appup.src
index 86ad09f639..1c55a92b55 100644
--- a/lib/megaco/src/app/megaco.appup.src
+++ b/lib/megaco/src/app/megaco.appup.src
@@ -191,7 +191,7 @@
{"%VSN%",
[
- {"3.17.3", []},
+ {"3.17.3", [{restart_application,megaco}]},
{"3.17.2", []},
{"3.17.1", [{restart_application,megaco}]},
{"3.17.0.3", [{restart_application,megaco}]},
@@ -206,7 +206,7 @@
}
],
[
- {"3.17.3", []},
+ {"3.17.3", [{restart_application,megaco}]},
{"3.17.2", []},
{"3.17.1", [{restart_application,megaco}]},
{"3.17.0.3", [{restart_application,megaco}]},
diff --git a/lib/megaco/src/engine/megaco_trans_sender.erl b/lib/megaco/src/engine/megaco_trans_sender.erl
index 710fef405a..e07f404289 100644
--- a/lib/megaco/src/engine/megaco_trans_sender.erl
+++ b/lib/megaco/src/engine/megaco_trans_sender.erl
@@ -672,8 +672,7 @@ to(To, Start) ->
%% Time in milli seconds
t() ->
- {A,B,C} = erlang:now(),
- A*1000000000+B*1000+(C div 1000).
+ erlang:monotonic_time(milli_seconds).
warning_msg(F, A) ->
?megaco_warning("Transaction sender: " ++ F, A).