浏览代码

Try to solve compilation failure for several system by
merge of revisions 43773, 43774 and 43775 from trunk to fixes_3_2
------------------------------------------------------------------------
r43773 | svenbarth | 2019-12-24 21:29:51 +0000 (Tue, 24 Dec 2019) | 1 line

* as long as the Comp type is declared, declare PComp as well
------------------------------------------------------------------------
--- Merging r43773 into '.':
U rtl/inc/systemh.inc
--- Recording mergeinfo for merge of r43773 into '.':
U .
------------------------------------------------------------------------
r43774 | svenbarth | 2019-12-24 21:29:53 +0000 (Tue, 24 Dec 2019) | 1 line

* if a CPU platform doesn't explicitely provide the Comp type we declare it as an alias to Int64
------------------------------------------------------------------------
--- Merging r43774 into '.':
G rtl/inc/systemh.inc
--- Recording mergeinfo for merge of r43774 into '.':
G .
------------------------------------------------------------------------
r43775 | svenbarth | 2019-12-24 21:29:57 +0000 (Tue, 24 Dec 2019) | 1 line

* Delphi allows overloading based on Comp, so declare it as a type rename instead of a mere alias
------------------------------------------------------------------------
--- Merging r43775 into '.':
G rtl/inc/systemh.inc
--- Recording mergeinfo for merge of r43775 into '.':
G .

git-svn-id: branches/fixes_3_2@43958 -

pierre 5 年之前
父节点
当前提交
d79fe2a393
共有 1 个文件被更改,包括 7 次插入38 次删除
  1. 7 38
      rtl/inc/systemh.inc

+ 7 - 38
rtl/inc/systemh.inc

@@ -193,10 +193,6 @@ Type
   {$ifndef FPUNONE}
     ValReal = Double;
   {$endif}
-
-  { map comp to int64, but this doesn't mean we compile the comp support in! }
-  Comp = Int64;
-  PComp = ^Comp;
 {$endif FPC_HAS_TYPE_EXTENDED}
 
   {$define SUPPORT_SINGLE}
@@ -225,10 +221,6 @@ Type
     ValReal = Real;
   {$endif}
 
-  { Comp type does not exist on fpu }
-  Comp    = int64;
-  PComp = ^Comp;
-
   FarPointer = Pointer;
 {$endif CPUM68K}
 
@@ -244,10 +236,6 @@ Type
     ValReal = Double;
   {$endif}
 
-  { map comp to int64, but this doesn't mean we compile the comp support in! }
-  Comp = Int64;
-  PComp = ^Comp;
-
   FarPointer = Pointer;
 {$endif CPUPOWERPC}
 
@@ -263,10 +251,6 @@ Type
     ValReal = Double;
   {$endif}
 
-  { map comp to int64, but this doesn't mean we compile the comp support in! }
-  Comp = Int64;
-  PComp = ^Comp;
-
   FarPointer = Pointer;
 {$endif CPUSPARC}
 
@@ -280,10 +264,6 @@ Type
     ValReal = Double;
   {$endif}
 
-  { map comp to int64, but this doesn't mean we compile the comp support in! }
-  Comp = Int64;
-  PComp = ^Comp;
-
   FarPointer = Pointer;
 {$endif CPUSPARC64}
 
@@ -300,10 +280,6 @@ Type
     ValReal = Double;
   {$endif}
 
-  { map comp to int64, but this doesn't mean we compile the comp support in! }
-  Comp = Int64;
-  PComp = ^Comp;
-
   FarPointer = Pointer;
 {$endif CPUMIPS32}
 
@@ -322,10 +298,6 @@ Type
     ValReal = Real;
   {$endif}
 
-  { map comp to int64, but this doesn't mean we compile the comp support in! }
-  Comp = Int64;
-  PComp = ^Comp;
-
   FarPointer = Pointer;
 {$endif CPUARM}
 
@@ -345,10 +317,6 @@ Type
     ValReal = Real;
   {$endif}
 
-  { map comp to int64, but this doesn't mean we compile the comp support in! }
-  Comp = Int64;
-  PComp = ^Comp;
-
   FarPointer = Pointer;
 {$endif CPUAVR}
 
@@ -360,10 +328,6 @@ Type
 
   ValReal = Double;
 
-  { map comp to int64, but this doesn't mean we compile the comp support in! }
-  Comp = Int64;
-  PComp = ^Comp;
-
   FarPointer = Pointer;
 {$endif CPUAARCH64}
 
@@ -466,6 +430,11 @@ Type
   UInt32  = Cardinal;
   UIntPtr = PtrUInt;
 
+{$if not declared(Comp)}
+  { map comp to int64, but this doesn't mean we compile the comp support in! }
+  Comp = type Int64;
+{$endif}
+
 { Zero - terminated strings }
   PChar               = ^Char;
   PPChar              = ^PChar;
@@ -521,9 +490,9 @@ Type
   PPDouble            = ^PDouble;
 {$endif}
   PCurrency           = ^Currency;
-{$ifdef SUPPORT_COMP}
+{$if declared(Comp)}
   PComp               = ^Comp;
-{$endif SUPPORT_COMP}
+{$endif declared(Comp)}
 
   PSmallInt           = ^Smallint;
   PShortInt           = ^Shortint;