diff options
| author | Micael Karlberg <[email protected]> | 2012-07-11 11:25:19 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2012-07-11 11:25:19 +0200 |
| commit | 57958e49b0fe80e1fe96bab6fd0d2da196ac5584 (patch) | |
| tree | ed13be75a8c4e29f1a93f7a5ebafb913fcf5ac90 /lib/inets/src/tftp | |
| parent | d020e23b70ac9b850488cf4f0791b435876ba365 (diff) | |
| parent | 6549340d9920df8f8c29223fe1853a37e30f0a41 (diff) | |
| download | otp-57958e49b0fe80e1fe96bab6fd0d2da196ac5584.tar.gz otp-57958e49b0fe80e1fe96bab6fd0d2da196ac5584.tar.bz2 otp-57958e49b0fe80e1fe96bab6fd0d2da196ac5584.zip | |
Merge branch 'bmk/inets/otp_version_dependent_behaviour_def/OTP-10095' into bmk/inets/inets591_integration
Diffstat (limited to 'lib/inets/src/tftp')
| -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"). |