* fix avr compilation after r34975 by more tests against feature defines, resolves #31036

git-svn-id: trunk@35015 -

rtl/inc/objpas.inc

@@ -973,9 +973,9 @@
             result:='';
         end;
 
-      class function TObject.QualifiedClassName: ansistring;
+      class function TObject.QualifiedClassName: {$ifdef FPC_HAS_FEATURE_ANSISTRINGS}ansistring{$else FPC_HAS_FEATURE_ANSISTRINGS}shortstring{$endif FPC_HAS_FEATURE_ANSISTRINGS};
         var
-          uname: ansistring;
+          uname: {$ifdef FPC_HAS_FEATURE_ANSISTRINGS}ansistring{$else FPC_HAS_FEATURE_ANSISTRINGS}shortstring{$endif FPC_HAS_FEATURE_ANSISTRINGS};
         begin
           uname := UnitName; //TODO: change 'UnitName' to 'UnitScope' as soon as RTL implement it
           if uname='' then

rtl/inc/objpash.inc

@@ -249,7 +249,7 @@
 
           { new since Delphi 2009 }
           class function UnitName : {$ifdef FPC_HAS_FEATURE_ANSISTRINGS}ansistring{$else FPC_HAS_FEATURE_ANSISTRINGS}shortstring{$endif FPC_HAS_FEATURE_ANSISTRINGS};
-          class function QualifiedClassName: ansistring;
+          class function QualifiedClassName: {$ifdef FPC_HAS_FEATURE_ANSISTRINGS}ansistring{$else FPC_HAS_FEATURE_ANSISTRINGS}shortstring{$endif FPC_HAS_FEATURE_ANSISTRINGS};
           function Equals(Obj: TObject) : boolean;virtual;
           function GetHashCode: PtrInt;virtual;
           function ToString: {$ifdef FPC_HAS_FEATURE_ANSISTRINGS}ansistring{$else FPC_HAS_FEATURE_ANSISTRINGS}shortstring{$endif FPC_HAS_FEATURE_ANSISTRINGS};virtual;
@@ -454,6 +454,7 @@
                               Resourcestring support
 *****************************************************************************}
 
+{$ifdef FPC_HAS_FEATURE_RESOURCES}
   type
     PResourceStringRecord = ^TResourceStringRecord;
     TResourceStringRecord = Record
@@ -462,3 +463,4 @@
        DefaultValue : AnsiString;
        HashValue    : LongWord;
      end;
+{$endif FPC_HAS_FEATURE_RESOURCES}