Browse Source

* Renamed FPC_HAS_EXTENDED_RTTI define to FPC_HAS_UNIT_RTTI
* Adapted some comments

git-svn-id: branches/joost/classattributes@25321 -

joost 12 years ago
parent
commit
85a3c9b67c
4 changed files with 9 additions and 9 deletions
  1. 1 1
      compiler/aggas.pas
  2. 1 1
      compiler/ogbase.pas
  3. 2 2
      compiler/options.pas
  4. 5 5
      rtl/objpas/typinfo.pp

+ 1 - 1
compiler/aggas.pas

@@ -1824,7 +1824,7 @@ implementation
          sec_debug_abbrev,
          sec_debug_abbrev,
          { ELF resources (+ references to stabs debug information sections) }
          { ELF resources (+ references to stabs debug information sections) }
          sec_code (* sec_fpc *),
          sec_code (* sec_fpc *),
-         sec_data (* sec_extrtti *),
+         sec_data (* sec_rtti *),
          { Table of contents section }
          { Table of contents section }
          sec_code (* sec_toc *),
          sec_code (* sec_toc *),
          sec_code (* sec_init *),
          sec_code (* sec_init *),

+ 1 - 1
compiler/ogbase.pas

@@ -941,7 +941,7 @@ implementation
           {debug_line} [oso_Data,oso_noload,oso_debug],
           {debug_line} [oso_Data,oso_noload,oso_debug],
           {debug_abbrev} [oso_Data,oso_noload,oso_debug],
           {debug_abbrev} [oso_Data,oso_noload,oso_debug],
           {fpc} [oso_Data,oso_load,oso_write,oso_keep],
           {fpc} [oso_Data,oso_load,oso_write,oso_keep],
-          {extrtti} [oso_Data,oso_load,oso_write,oso_keep],
+          {rtti} [oso_Data,oso_load,oso_write,oso_keep],
           {toc} [oso_Data,oso_load,oso_readonly],
           {toc} [oso_Data,oso_load,oso_readonly],
           {init} [oso_Data,oso_load,oso_readonly,oso_executable,oso_keep],
           {init} [oso_Data,oso_load,oso_readonly,oso_executable,oso_keep],
           {fini} [oso_Data,oso_load,oso_readonly,oso_executable,oso_keep],
           {fini} [oso_Data,oso_load,oso_readonly,oso_executable,oso_keep],

+ 2 - 2
compiler/options.pas

@@ -2526,9 +2526,9 @@ begin
     else
     else
       undef_system_macro('FPC_HAS_WINLIKERESOURCES');
       undef_system_macro('FPC_HAS_WINLIKERESOURCES');
 
 
-  { Extended RTTI }
+  { RTTI with unitinfo }
 
 
-  def_system_macro('FPC_HAS_EXTENDED_RTTI');
+  def_system_macro('FPC_HAS_UNIT_RTTI');
 
 
   { Features }
   { Features }
   case target_info.system of
   case target_info.system of

+ 5 - 5
rtl/objpas/typinfo.pp

@@ -455,18 +455,18 @@ function aligntoptr(p : pointer) : pointer;inline;
 {$endif FPC_REQUIRES_PROPER_ALIGNMENT}
 {$endif FPC_REQUIRES_PROPER_ALIGNMENT}
    end;
    end;
 
 
-{$ifdef FPC_HAS_EXTENDED_RTTI}
+{$ifdef FPC_HAS_UNIT_RTTI}
 var
 var
   UnitList: TUnitInfoList; external name 'RTTIUNITLIST';
   UnitList: TUnitInfoList; external name 'RTTIUNITLIST';
-{$endif FPC_HAS_EXTENDED_RTTI}
+{$endif FPC_HAS_UNIT_RTTI}
 
 
 function GetUnitList: PUnitInfoList;
 function GetUnitList: PUnitInfoList;
 begin
 begin
-{$ifdef FPC_HAS_EXTENDED_RTTI}
+{$ifdef FPC_HAS_UNIT_RTTI}
   result := @UnitList;
   result := @UnitList;
-{$else FPC_HAS_EXTENDED_RTTI}
+{$else FPC_HAS_UNIT_RTTI}
   result := nil;
   result := nil;
-{$endif FPC_HAS_EXTENDED_RTTI}
+{$endif FPC_HAS_UNIT_RTTI}
 end;
 end;
 
 
 function GetAttributeData(TypeInfo: PTypeInfo): PAttributeData;
 function GetAttributeData(TypeInfo: PTypeInfo): PAttributeData;