compiler utils: manual merge some cpstrnew changes which was impossible to merge using regular tools due to the merge conflicts

git-svn-id: trunk@19133 -
This commit is contained in:
paul 2011-09-17 15:43:36 +00:00
parent fd5a15fda5
commit 85450d5469

View File

@ -1473,7 +1473,8 @@ const
(mask:po_objc; str:'ObjC'),
(mask:po_enumerator_movenext; str:'EnumeratorMoveNext'),
(mask:po_optional; str: 'Optional'),
(mask:po_delphi_nested_cc;str: 'Delphi-style nested frameptr')
(mask:po_delphi_nested_cc;str: 'Delphi-style nested frameptr'),
(mask:po_rtlproc; str: 'RTL procedure')
);
var
proctypeoption : tproctypeoption;