paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-12 12:05:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: trunk@19133 -
This commit is contained in:
paul 2011-09-17 15:43:36 +00:00
parent fd5a15fda5
commit 85450d5469
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
compiler/utils/ppudump.pp
View File

@ -1473,7 +1473,8 @@ const
(mask:po_objc; str:'ObjC'), (mask:po_objc; str:'ObjC'),
(mask:po_enumerator_movenext; str:'EnumeratorMoveNext'), (mask:po_enumerator_movenext; str:'EnumeratorMoveNext'),
(mask:po_optional; str: 'Optional'), (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 var
proctypeoption : tproctypeoption; proctypeoption : tproctypeoption;