From 1193fdece4ff5b5bc127e638db5eeb018014c7af Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Tue, 18 Oct 2011 18:08:29 +0200
Subject: Make it possible to compile with an R14B compiler.

---
 lib/inets/src/inets_app/Makefile          |  3 ++-
 lib/inets/src/inets_app/inets.mk          |  4 ++++
 lib/inets/src/inets_app/inets_service.erl | 19 ++++++++++++++++++-
 lib/inets/src/tftp/tftp.erl               | 16 ++++++++++++++++
 4 files changed, 40 insertions(+), 2 deletions(-)

(limited to 'lib/inets')

diff --git a/lib/inets/src/inets_app/Makefile b/lib/inets/src/inets_app/Makefile
index 20e22917e2..63ab0a5bae 100644
--- a/lib/inets/src/inets_app/Makefile
+++ b/lib/inets/src/inets_app/Makefile
@@ -30,6 +30,7 @@ include ../../vsn.mk
 
 VSN = $(INETS_VSN)
 
+
 # ----------------------------------------------------
 # Release directory specification
 # ----------------------------------------------------
@@ -41,8 +42,8 @@ RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
 # ----------------------------------------------------
 
 MODULES = \
-	inets_service \
 	inets \
+	inets_service \
 	inets_app \
 	inets_sup \
 	inets_regexp
diff --git a/lib/inets/src/inets_app/inets.mk b/lib/inets/src/inets_app/inets.mk
index b6e9fe1d96..35fb0d7eca 100644
--- a/lib/inets/src/inets_app/inets.mk
+++ b/lib/inets/src/inets_app/inets.mk
@@ -33,6 +33,10 @@ ifeq ($(WARN_UNUSED_WARS), true)
 ERL_COMPILE_FLAGS += +warn_unused_vars
 endif
 
+ifeq ($(shell erl -noshell -eval 'io:format("~4s", [erlang:system_info(otp_release)])' -s init stop), R14B)
+INETS_ERL_COMPILE_FLAGS += -D'OTP-R14B-COMPILER'
+endif
+
 INETS_APP_VSN_COMPILE_FLAGS = \
 	+'{parse_transform,sys_pre_attributes}' \
 	+'{attribute,insert,app_vsn,$(APP_VSN)}'
diff --git a/lib/inets/src/inets_app/inets_service.erl b/lib/inets/src/inets_app/inets_service.erl
index f89dac195c..a057a51e2c 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-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2011. 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,6 +20,21 @@
 
 -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}
 %%    <service>:start_link(Config).
@@ -67,3 +82,5 @@
 
 -callback service_info(Service :: term()) ->
     {ok, [{Property :: term(), Value :: term()}]} | {error, Reason :: term()}.
+
+-endif.
diff --git a/lib/inets/src/tftp/tftp.erl b/lib/inets/src/tftp/tftp.erl
index b33c0a98f4..8d8fce388d 100644
--- a/lib/inets/src/tftp/tftp.erl
+++ b/lib/inets/src/tftp/tftp.erl
@@ -224,6 +224,20 @@
 	 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(),
@@ -266,6 +280,8 @@
 
 -callback abort(Code :: error_code(), string(), State :: term()) -> 'ok'.
 
+-endif.
+
 -include("tftp.hrl").
 
 
-- 
cgit v1.2.3