From bcb7061314c2f64be46bc626531492eb45ff0aa2 Mon Sep 17 00:00:00 2001
From: florian <florian@freepascal.org>
Date: Sat, 26 Nov 2016 19:33:31 +0000
Subject: [PATCH] * made TObject usable, even if no ansistring support is
 available

git-svn-id: trunk@34974 -
---
 rtl/inc/objpas.inc  | 4 ++--
 rtl/inc/objpash.inc | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/rtl/inc/objpas.inc b/rtl/inc/objpas.inc
index d7c4b8b883..457f439afa 100644
--- a/rtl/inc/objpas.inc
+++ b/rtl/inc/objpas.inc
@@ -946,7 +946,7 @@
           getinterfacetable:=PVmt(Self)^.vIntfTable;
         end;
 
-      class function TObject.UnitName : ansistring;
+      class function TObject.UnitName : {$ifdef FPC_HAS_FEATURE_ANSISTRINGS}ansistring{$else FPC_HAS_FEATURE_ANSISTRINGS}shortstring{$endif FPC_HAS_FEATURE_ANSISTRINGS};
         type
           // from the typinfo unit
           TClassTypeInfo = {$ifndef FPC_REQUIRES_PROPER_ALIGNMENT}packed{$endif}record
@@ -994,7 +994,7 @@
           result:=PtrInt(Self);
         end;
 
-      function TObject.ToString: ansistring;
+      function TObject.ToString: {$ifdef FPC_HAS_FEATURE_ANSISTRINGS}ansistring{$else FPC_HAS_FEATURE_ANSISTRINGS}shortstring{$endif FPC_HAS_FEATURE_ANSISTRINGS};
         begin
           result:=ClassName;
         end;
diff --git a/rtl/inc/objpash.inc b/rtl/inc/objpash.inc
index e7327442b2..9ba1b9646c 100644
--- a/rtl/inc/objpash.inc
+++ b/rtl/inc/objpash.inc
@@ -248,11 +248,11 @@
           class function GetInterfaceTable : pinterfacetable;
 
           { new since Delphi 2009 }
-          class function UnitName : ansistring;
+          class function UnitName : {$ifdef FPC_HAS_FEATURE_ANSISTRINGS}ansistring{$else FPC_HAS_FEATURE_ANSISTRINGS}shortstring{$endif FPC_HAS_FEATURE_ANSISTRINGS};
           class function QualifiedClassName: ansistring;
           function Equals(Obj: TObject) : boolean;virtual;
           function GetHashCode: PtrInt;virtual;
-          function ToString: ansistring;virtual;
+          function ToString: {$ifdef FPC_HAS_FEATURE_ANSISTRINGS}ansistring{$else FPC_HAS_FEATURE_ANSISTRINGS}shortstring{$endif FPC_HAS_FEATURE_ANSISTRINGS};virtual;
        end;
 
        IUnknown = interface