paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-12-05 08:09:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

--- Merging r43776 into '.':

Browse Source 
C    rtl/inc/systemh.inc
--- Recording mergeinfo for merge of r43776 into '.':
 U   .
Summary of conflicts:
  Text conflicts: 1

# revisions: 43776
r43776 | svenbarth | 2019-12-24 22:30:00 +0100 (Tue, 24 Dec 2019) | 1 line
Changed paths:
   M /trunk/rtl/inc/systemh.inc

* if a CPU platform does not provide a FarPointer type then declare it as an alias to a mere Pointer

git-svn-id: branches/fixes_3_2@47918 -
This commit is contained in:
marco 2020-12-30 23:04:49 +00:00
parent 0df7437a47
commit c612e9c69e
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
rtl/inc/systemh.inc
View File

@ -198,9 +198,6 @@ Type
{$define SUPPORT_SINGLE}
{$define SUPPORT_DOUBLE}
{$ifndef VER2_6}
FarPointer = Pointer;
{$endif}
{$endif CPUX86_64}
{$ifdef CPUM68K}
@ -221,7 +218,6 @@ Type
ValReal = Real;
{$endif}
FarPointer = Pointer;
{$endif CPUM68K}
{$ifdef CPUPOWERPC}
@ -236,7 +232,6 @@ Type
ValReal = Double;
{$endif}
FarPointer = Pointer;
{$endif CPUPOWERPC}
{$ifdef CPUSPARC}
@ -251,7 +246,6 @@ Type
ValReal = Double;
{$endif}
FarPointer = Pointer;
{$endif CPUSPARC}
{$ifdef CPUSPARC64}
@ -264,7 +258,6 @@ Type
ValReal = Double;
{$endif}
FarPointer = Pointer;
{$endif CPUSPARC64}
{$if defined(CPUMIPS32) or defined(CPUMIPSEL32)}
@ -280,7 +273,6 @@ Type
ValReal = Double;
{$endif}
FarPointer = Pointer;
{$endif CPUMIPS32}
@ -298,7 +290,6 @@ Type
ValReal = Real;
{$endif}
FarPointer = Pointer;
{$endif CPUARM}
{$ifdef CPUAVR}
@ -317,7 +308,6 @@ Type
ValReal = Real;
{$endif}
FarPointer = Pointer;
{$endif CPUAVR}
{$ifdef CPUAARCH64}
@ -328,9 +318,12 @@ Type
ValReal = Double;
FarPointer = Pointer;
{$endif CPUAARCH64}
{$if not declared(FarPointer)}
FarPointer = Pointer;
{$endif}
{$ifdef CPU64}
SizeInt = Int64;