mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-04-21 01:09:31 +02:00
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:
parent
fd5a15fda5
commit
85450d5469
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user