From b29afc15c95e44c09f16c38c4f281a6cd735e6a8 Mon Sep 17 00:00:00 2001 From: X4lldux Date: Fri, 3 Jul 2015 15:35:50 +0200 Subject: [PATCH] Support OTP 18 --- .travis.yml | 1 + rebar.config | 2 +- src/eep_clock_wall.erl | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 317b585..80f39cb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,6 @@ language: erlang otp_release: + - 18.0 - 17.1 - 17.0 - R16B03 diff --git a/rebar.config b/rebar.config index 694b38b..d65d5d3 100644 --- a/rebar.config +++ b/rebar.config @@ -1,4 +1,4 @@ -{require_otp_vsn, "R14|R15|R16|17"}. +{require_otp_vsn, "R14|R15|R16|17|18"}. {eunit_opts, [verbose]}. diff --git a/src/eep_clock_wall.erl b/src/eep_clock_wall.erl index fddb690..5315f2f 100644 --- a/src/eep_clock_wall.erl +++ b/src/eep_clock_wall.erl @@ -50,5 +50,5 @@ inc(State) -> State#eep_clock{at = ts()}. ts() -> - {MegaSecs,Secs,MicroSecs} = erlang:now(), + {MegaSecs,Secs,MicroSecs} = erlang:timestamp(), erlang:round((MegaSecs*1000000 + Secs)*1000 + (MicroSecs/1000)).