diff options
| author | Micael Karlberg <[email protected]> | 2012-08-17 11:36:28 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2012-08-17 11:36:28 +0200 |
| commit | 1105b3f693535a7c1f2578dedf8ccb95bf262d0d (patch) | |
| tree | f4b21e26fb82de8114504ff045c0b5779c70afb3 /lib/inets/src/inets_app/inets_service.erl | |
| parent | cd20b76c9acc276c57e5892aa3968fdb359816b9 (diff) | |
| parent | 9125e9158a7547e51c94276aec6b98e9424c0c68 (diff) | |
| download | otp-1105b3f693535a7c1f2578dedf8ccb95bf262d0d.tar.gz otp-1105b3f693535a7c1f2578dedf8ccb95bf262d0d.tar.bz2 otp-1105b3f693535a7c1f2578dedf8ccb95bf262d0d.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/inets/src/inets_app/inets_service.erl')
| -rw-r--r-- | lib/inets/src/inets_app/inets_service.erl | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/lib/inets/src/inets_app/inets_service.erl b/lib/inets/src/inets_app/inets_service.erl index a057a51e2c..d17fdfe13e 100644 --- a/lib/inets/src/inets_app/inets_service.erl +++ b/lib/inets/src/inets_app/inets_service.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2007-2011. All Rights Reserved. +%% Copyright Ericsson AB 2007-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 @@ -20,20 +20,6 @@ -module(inets_service). --ifdef('OTP-R14B-COMPILER'). - --export([behaviour_info/1]). - -behaviour_info(callbacks) -> - [{start_standalone, 1}, - {start_service, 1}, - {stop_service, 1}, - {services, 0}, - {service_info, 1}]; -behaviour_info(_) -> - undefined. - --else. %% Starts service stand-alone %% start_standalone(Config) -> % {ok, Pid} | {error, Reason} @@ -83,4 +69,3 @@ behaviour_info(_) -> -callback service_info(Service :: term()) -> {ok, [{Property :: term(), Value :: term()}]} | {error, Reason :: term()}. --endif. |