diff --git a/.gitattributes b/.gitattributes index a507423efe..ee64a549ef 100644 --- a/.gitattributes +++ b/.gitattributes @@ -16096,6 +16096,7 @@ tests/webtbs/tw33439.pp svneol=native#text/pascal tests/webtbs/tw3348.pp svneol=native#text/plain tests/webtbs/tw3349.pp svneol=native#text/plain tests/webtbs/tw3351.pp svneol=native#text/plain +tests/webtbs/tw33515.pp svneol=native#text/pascal tests/webtbs/tw3353.pp svneol=native#text/plain tests/webtbs/tw33542.pp svneol=native#text/pascal tests/webtbs/tw33548.pp svneol=native#text/plain diff --git a/compiler/ncal.pas b/compiler/ncal.pas index fdcd9eb7b1..67787ab890 100644 --- a/compiler/ncal.pas +++ b/compiler/ncal.pas @@ -4372,7 +4372,7 @@ implementation result:=pass1_inline else begin - if po_inline in procdefinition.procoptions then + if (po_inline in procdefinition.procoptions) and not(po_compilerproc in procdefinition.procoptions) then Message1(cg_h_no_inline,tprocdef(procdefinition).customprocname([pno_proctypeoption, pno_paranames,pno_ownername, pno_noclassmarker])); mark_unregable_parameters; result:=pass1_normal; diff --git a/tests/webtbs/tw33515.pp b/tests/webtbs/tw33515.pp new file mode 100644 index 0000000000..5f61df14d4 --- /dev/null +++ b/tests/webtbs/tw33515.pp @@ -0,0 +1,8 @@ +{ %OPT=-Seh } +program Test; +uses SysUtils; +var + FS: TFormatSettings; +begin + FS := DefaultFormatSettings; +end.