paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-14 09:19:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: trunk@35015 -
This commit is contained in:
florian 2016-11-29 20:37:58 +00:00
parent 6ba85c2a70
commit 091b31fc76
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rtl/inc/objpas.inc
View File

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

4
rtl/inc/objpash.inc
View File

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