diff options
| author | Lukas Larsson <[email protected]> | 2011-07-25 10:59:30 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2011-08-02 14:43:29 +0200 |
| commit | d4c67f705a418ed02a7128ca74819cb995f27577 (patch) | |
| tree | ea00a952fda848974e36831999547effe6c32871 /lib | |
| parent | b16af6d09ef2a5843e1fb491114906780f3f970d (diff) | |
| download | otp-d4c67f705a418ed02a7128ca74819cb995f27577.tar.gz otp-d4c67f705a418ed02a7128ca74819cb995f27577.tar.bz2 otp-d4c67f705a418ed02a7128ca74819cb995f27577.zip | |
Remove some superflous includes which caused inlined modules to have lots of compile warnings
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/asn1/src/asn1ct_gen.erl | 5 | ||||
| -rw-r--r-- | lib/asn1/src/asn1rt.erl | 2 | ||||
| -rw-r--r-- | lib/asn1/src/asn1rt_ber_bin_v2.erl | 6 | ||||
| -rw-r--r-- | lib/asn1/src/asn1rt_check.erl | 2 |
4 files changed, 5 insertions, 10 deletions
diff --git a/lib/asn1/src/asn1ct_gen.erl b/lib/asn1/src/asn1ct_gen.erl index e18bc37058..0f8833f716 100644 --- a/lib/asn1/src/asn1ct_gen.erl +++ b/lib/asn1/src/asn1ct_gen.erl @@ -1521,8 +1521,9 @@ gen_head(Erules,Mod,Hrl) -> emit({"-module('",Mod,"').",nl}), put(currmod,Mod), %emit({"-compile(export_all).",nl}), - case Hrl of - 0 -> true; + case {Hrl,lists:member(inline,get(encoding_options))} of + {0,_} -> true; + {_,true} -> true; _ -> emit({"-include(\"",Mod,".hrl\").",nl}) end, diff --git a/lib/asn1/src/asn1rt.erl b/lib/asn1/src/asn1rt.erl index e9d3ea9a72..d18f81346a 100644 --- a/lib/asn1/src/asn1rt.erl +++ b/lib/asn1/src/asn1rt.erl @@ -21,8 +21,6 @@ %% Runtime functions for ASN.1 (i.e encode, decode) --include("asn1_records.hrl"). - -export([encode/2,encode/3,decode/3,load_driver/0,unload_driver/0,info/1]). -export([utf8_binary_to_list/1,utf8_list_to_binary/1]). diff --git a/lib/asn1/src/asn1rt_ber_bin_v2.erl b/lib/asn1/src/asn1rt_ber_bin_v2.erl index bef2216091..17e66f77c9 100644 --- a/lib/asn1/src/asn1rt_ber_bin_v2.erl +++ b/lib/asn1/src/asn1rt_ber_bin_v2.erl @@ -56,8 +56,6 @@ -export([decode_primitive_incomplete/2,decode_selective/2]). -export([is_nif_loadable/0]). - --include("asn1_records.hrl"). % the encoding of class of tag bits 8 and 7 -define(UNIVERSAL, 0). @@ -1058,7 +1056,7 @@ encode_real(C,Val, TagIn) when is_tuple(Val); is_list(Val) -> encode_real(C,Val) -> - ?RT_COMMON:encode_real(C,Val). + asn1rt_ber_bin:encode_real(C,Val). %%============================================================================ @@ -1083,7 +1081,7 @@ decode_real_notag(Buffer) -> {_T,_V} -> exit({error,{asn1,{real_not_in_primitive_form,Buffer}}}) end, - {Val,_Rest,Len} = ?RT_COMMON:decode_real(Buffer,Len), + {Val,_Rest,Len} = asn1rt_ber_bin:decode_real(Buffer,Len), Val. %% exit({error,{asn1, {unimplemented,real}}}). %% decode_real2(Buffer, Form, size(Buffer)). diff --git a/lib/asn1/src/asn1rt_check.erl b/lib/asn1/src/asn1rt_check.erl index 24a2a3802d..d9856901b8 100644 --- a/lib/asn1/src/asn1rt_check.erl +++ b/lib/asn1/src/asn1rt_check.erl @@ -19,8 +19,6 @@ %% -module(asn1rt_check). --include("asn1_records.hrl"). - -export([check_bool/2, check_int/3, check_bitstring/3, |