diff options
Diffstat (limited to 'lib/stdlib')
| -rw-r--r-- | lib/stdlib/src/epp.erl | 4 | ||||
| -rw-r--r-- | lib/stdlib/test/epp_SUITE.erl | 3 | 
2 files changed, 5 insertions, 2 deletions
| diff --git a/lib/stdlib/src/epp.erl b/lib/stdlib/src/epp.erl index 77cc88eb08..e823156af1 100644 --- a/lib/stdlib/src/epp.erl +++ b/lib/stdlib/src/epp.erl @@ -571,6 +571,7 @@ init_server(Pid, Name, Options, St0) ->  predef_macros(File) ->      Machine = list_to_atom(erlang:system_info(machine)),      Anno = line1(), +    OtpVersion = list_to_integer(erlang:system_info(otp_release)),      Defs = [{'FILE', 	           {none,[{string,Anno,File}]}},  	    {'FUNCTION_NAME',      undefined},  	    {'FUNCTION_ARITY',     undefined}, @@ -580,7 +581,8 @@ predef_macros(File) ->  	    {'BASE_MODULE',	   undefined},  	    {'BASE_MODULE_STRING', undefined},  	    {'MACHINE',	           {none,[{atom,Anno,Machine}]}}, -	    {Machine,	           {none,[{atom,Anno,true}]}} +	    {Machine,	           {none,[{atom,Anno,true}]}}, +	    {'OTP_RELEASE',	   {none,[{integer,Anno,OtpVersion}]}}  	   ],      maps:from_list(Defs). diff --git a/lib/stdlib/test/epp_SUITE.erl b/lib/stdlib/test/epp_SUITE.erl index 9123bf2f28..87e906a3d4 100644 --- a/lib/stdlib/test/epp_SUITE.erl +++ b/lib/stdlib/test/epp_SUITE.erl @@ -799,7 +799,8 @@ otp_8130(Config) when is_list(Config) ->      PreDefMacs = macs(Epp),      ['BASE_MODULE','BASE_MODULE_STRING','BEAM','FILE',       'FUNCTION_ARITY','FUNCTION_NAME', -     'LINE','MACHINE','MODULE','MODULE_STRING'] = PreDefMacs, +     'LINE','MACHINE','MODULE','MODULE_STRING', +     'OTP_RELEASE'] = PreDefMacs,      {ok,[{'-',_},{atom,_,file}|_]} = epp:scan_erl_form(Epp),      {ok,[{'-',_},{atom,_,module}|_]} = epp:scan_erl_form(Epp),      {ok,[{atom,_,t}|_]} = epp:scan_erl_form(Epp), | 
