Browse Source

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 -
paul 14 years ago
parent
commit
85450d5469
1 changed files with 2 additions and 1 deletions
  1. 2 1
      compiler/utils/ppudump.pp

+ 2 - 1
compiler/utils/ppudump.pp

@@ -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;