diff --git a/tests/tbs/tb0368.pp b/tests/tbs/tb0368.pp index 09f82a918a..ce8ac84f0e 100644 --- a/tests/tbs/tb0368.pp +++ b/tests/tbs/tb0368.pp @@ -1,7 +1,8 @@ type tproc = procedure of object; trec = record - l1,l2 : ptrint; + l1 : codeptrint; + l2 : ptrint; end; var pfn : tproc; diff --git a/tests/tbs/tb0423.pp b/tests/tbs/tb0423.pp index 74b14fc063..25e2d4bf28 100644 --- a/tests/tbs/tb0423.pp +++ b/tests/tbs/tb0423.pp @@ -1,8 +1,12 @@ {$ifdef fpc}{$mode delphi}{$endif} type +{$ifndef fpc} + codepointer = pointer; +{$endif} tmethod = record - code,data : pointer; + code : codepointer; + data : pointer; end; var diff --git a/tests/tbs/tb0433.pp b/tests/tbs/tb0433.pp index f04806c478..32a939837d 100644 --- a/tests/tbs/tb0433.pp +++ b/tests/tbs/tb0433.pp @@ -1,5 +1,8 @@ {$ifdef fpc} {$mode tp} +{$else fpc} +type + codepointer = pointer; {$endif fpc} function times2(x : longint) : longint; @@ -10,7 +13,7 @@ end; var x:function(x:longint):longint; - y:pointer absolute x; + y:codepointer absolute x; z,w,v:pointer; begin z:=@@x; diff --git a/tests/tbs/tb0433a.pp b/tests/tbs/tb0433a.pp index a3b70eefd7..a2ee28980e 100644 --- a/tests/tbs/tb0433a.pp +++ b/tests/tbs/tb0433a.pp @@ -1,5 +1,8 @@ {$ifdef fpc} {$mode delphi} +{$else fpc} +type + codepointer = pointer; {$endif fpc} function times2(x : longint) : longint; @@ -10,8 +13,8 @@ end; var x:function(x:longint):longint; - y:pointer absolute x; - z,w,v:pointer; + y:codepointer absolute x; + z,w,v:codepointer; begin x:=times2; z:=@x; diff --git a/tests/tbs/tb0508.pp b/tests/tbs/tb0508.pp index 87385c5012..71489e05df 100644 --- a/tests/tbs/tb0508.pp +++ b/tests/tbs/tb0508.pp @@ -3,7 +3,7 @@ type PointerLocal = procedure(_EBP: Pointer); -procedure proccall(p: pointer); +procedure proccall(p: codepointer); begin PointerLocal(p)(get_caller_frame(get_frame)); end; diff --git a/tests/tbs/tb0594.pp b/tests/tbs/tb0594.pp index 7566b053da..2b89ed37eb 100644 --- a/tests/tbs/tb0594.pp +++ b/tests/tbs/tb0594.pp @@ -3,6 +3,9 @@ {$endif} type +{$ifndef fpc} + codepointer = pointer; +{$endif} tc = class class procedure test; end; @@ -20,6 +23,6 @@ var begin p:=tp(tc.test); p2:=tc.test; - if pointer(@p)<>tmethod(p2).code then + if codepointer(@p)<>tmethod(p2).code then halt(1); end.