diff options
| author | Micael Karlberg <[email protected]> | 2012-08-17 11:26:48 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2012-08-17 11:26:48 +0200 |
| commit | 28075f98b7f4faaae93fd6353e1cb34386d22e18 (patch) | |
| tree | 74545b0b74b299a148142a94e3a5595788c5a7ea /lib/inets/src/tftp/tftp.erl | |
| parent | 68e0078eb58803dc4a7e0bfd801f32c2c92b7f26 (diff) | |
| parent | c5578ac8a95de1193bc6d0c7d2e579eba1c197e2 (diff) | |
| download | otp-28075f98b7f4faaae93fd6353e1cb34386d22e18.tar.gz otp-28075f98b7f4faaae93fd6353e1cb34386d22e18.tar.bz2 otp-28075f98b7f4faaae93fd6353e1cb34386d22e18.zip | |
Merge branch 'bmk/inets/inets591_integration' into maint
Diffstat (limited to 'lib/inets/src/tftp/tftp.erl')
| -rw-r--r-- | lib/inets/src/tftp/tftp.erl | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/lib/inets/src/tftp/tftp.erl b/lib/inets/src/tftp/tftp.erl index 0d7ae1a89e..1621add246 100644 --- a/lib/inets/src/tftp/tftp.erl +++ b/lib/inets/src/tftp/tftp.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2005-2011. All Rights Reserved. +%% Copyright Ericsson AB 2005-2012. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -224,20 +224,6 @@ service_info/1 ]). --ifdef('OTP-R14B-COMPILER'). - --export([behaviour_info/1]). - -behaviour_info(callbacks) -> - [{prepare, 6}, - {open, 6}, - {read, 1}, - {write, 2}, - {abort, 3}]; -behaviour_info(_) -> - undefined. - --else. -type peer() :: {PeerType :: inet | inet6, PeerHost :: inet:ip_address(), @@ -280,8 +266,6 @@ behaviour_info(_) -> -callback abort(Code :: error_code(), string(), State :: term()) -> 'ok'. --endif. - -include("tftp.hrl"). |