diff options
| author | Erland Schönbeck <[email protected]> | 2015-03-25 12:55:19 +0100 |
|---|---|---|
| committer | Erland Schönbeck <[email protected]> | 2015-03-25 12:55:19 +0100 |
| commit | d6797e9a34df677e82db5ee8b8388fbdf57f09f5 (patch) | |
| tree | 1229a0acce281d4185d1ffcea44569947c31009c /lib/inets/src/tftp/tftp_sup.erl | |
| parent | a206e66f13471cdad02a966fcb569673e0938fa4 (diff) | |
| parent | e10385909c687590d6522d007bba9d72f3f5c380 (diff) | |
| download | otp-d6797e9a34df677e82db5ee8b8388fbdf57f09f5.tar.gz otp-d6797e9a34df677e82db5ee8b8388fbdf57f09f5.tar.bz2 otp-d6797e9a34df677e82db5ee8b8388fbdf57f09f5.zip | |
Merge branch 'erland/OTP18/inets/time_api/OTP-12441'
* erland/OTP18/inets/time_api/OTP-12441:
inets: Add new module inets_time_compat with new time API The new module is backwards compatible.
Diffstat (limited to 'lib/inets/src/tftp/tftp_sup.erl')
| -rw-r--r-- | lib/inets/src/tftp/tftp_sup.erl | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/lib/inets/src/tftp/tftp_sup.erl b/lib/inets/src/tftp/tftp_sup.erl index 3065279515..7a0dcffc90 100644 --- a/lib/inets/src/tftp/tftp_sup.erl +++ b/lib/inets/src/tftp/tftp_sup.erl @@ -22,7 +22,6 @@ %%---------------------------------------------------------------------- -module(tftp_sup). --compile([{nowarn_deprecated_function,{erlang,now,0}}]). -behaviour(supervisor). @@ -94,17 +93,7 @@ unique_name(Options) -> {value, {_, Port}} when is_integer(Port), Port > 0 -> {tftpd, Port}; _ -> - {tftpd, unique_integer()} - end. - -unique_integer() -> - %% Adapt to OTP 18 erlang time API and be backwards compatible - try - erlang:unique_integer([positive]) - catch - error:undef -> - {MS, S, US} = erlang:now(), - (MS*1000000+S)*1000000+US + {tftpd, inets_time_compat:unique_integer([positive])} end. default_kill_after() -> |