--- Merging r43776 into '.':

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: https://svn.freepascal.org/svn/fpc/branches/fixes_3_2@47918 3ad0048d-3df7-0310-abae-a5850022a9f2

1 files changed, 4 insertions, 11 deletions

diff --git a/rtl/inc/systemh.inc b/rtl/inc/systemh.inc
index fd943366e4..a7987e2f5e 100644
--- a/rtl/inc/systemh.inc
+++ b/rtl/inc/systemh.inc
@@ -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;