From f3a686eb6903843d08bc60bb7fc7b8926ca83c77 Mon Sep 17 00:00:00 2001
From: nickysn <nickysn@gmail.com>
Date: Sat, 19 Oct 2013 21:43:40 +0000
Subject: [PATCH] * i8086 far code memory model fixes in tests
 tw2739,tw3173,tw16034,tw1152,   tw2944 and tw9261

git-svn-id: trunk@25832 -
---
 tests/webtbs/tw1152.pp  | 2 +-
 tests/webtbs/tw16034.pp | 7 ++++++-
 tests/webtbs/tw2739.pp  | 2 +-
 tests/webtbs/tw2944.pp  | 8 ++++++--
 tests/webtbs/tw3173.pp  | 9 +++++++--
 tests/webtbs/tw9261.pp  | 4 ++--
 6 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/tests/webtbs/tw1152.pp b/tests/webtbs/tw1152.pp
index be5cb19b96..23074b9a6b 100644
--- a/tests/webtbs/tw1152.pp
+++ b/tests/webtbs/tw1152.pp
@@ -10,7 +10,7 @@
 program exception;
 uses sysutils,crt;
 var
-  saveexit : pointer;
+  saveexit : codepointer;
   finally_called : boolean;
 
 procedure my_exit;
diff --git a/tests/webtbs/tw16034.pp b/tests/webtbs/tw16034.pp
index 3bee77feb0..2087571c1b 100644
--- a/tests/webtbs/tw16034.pp
+++ b/tests/webtbs/tw16034.pp
@@ -9,6 +9,11 @@ program Hello;
 
 type
   ptr = pointer;
+{$ifdef fpc}
+  codeptr = codepointer;
+{$else}
+  codeptr = pointer;
+{$endif}
   Int = ptrint;
   pPtr = ^ptr;
   UInt = ptruint;
@@ -109,7 +114,7 @@ var
 
   s0, s1, s2: UInt;
   v0, v1, v2: ptr;
-  cn0, cn1, cn2: ptr;
+  cn0, cn1, cn2: codeptr;
 
 begin
   // VMT Pointers
diff --git a/tests/webtbs/tw2739.pp b/tests/webtbs/tw2739.pp
index d9db2bbc74..d166aa5ab1 100644
--- a/tests/webtbs/tw2739.pp
+++ b/tests/webtbs/tw2739.pp
@@ -26,7 +26,7 @@ end;
 
 function JclAddExceptNotifier(const NotifyMethod: TJclExceptNotifyMethod): Boolean; overload;
 var
-  p : pointer;
+  p : codepointer;
 begin
   p:=@NotifyMethod;
 end;
diff --git a/tests/webtbs/tw2944.pp b/tests/webtbs/tw2944.pp
index 1b4f22df6f..38d57c8835 100644
--- a/tests/webtbs/tw2944.pp
+++ b/tests/webtbs/tw2944.pp
@@ -4,9 +4,13 @@
 
 {$ifdef fpc}{$mode Delphi}{$endif}
 type
+{$ifndef fpc}
+  CodePointer = Pointer;
+  PCodePointer = PPointer;
+{$endif}
   WS2StubEntry = record
-    StubProc : Pointer;
-    ProcVar : PPointer;
+    StubProc : CodePointer;
+    ProcVar : PCodePointer;
     Name : PChar;
   end;
   LPFN_WSACLEANUP = function : Integer; stdcall;
diff --git a/tests/webtbs/tw3173.pp b/tests/webtbs/tw3173.pp
index 2a1ccab719..e4378999ef 100644
--- a/tests/webtbs/tw3173.pp
+++ b/tests/webtbs/tw3173.pp
@@ -2,11 +2,16 @@
 { Submitted by "Dominik Zablotny" on  2004-06-18 }
 { e-mail: dominz@wp.pl }
 program test;
-{$ifdef fpc}{$mode delphi}{$endif}
+{$ifdef fpc}
+  {$mode delphi}
+{$else}
+type
+  codepointer = pointer;
+{$endif}
 var
   p: procedure of object;
 
-  function f:pointer;
+  function f:codepointer;
   begin
   end;
 
diff --git a/tests/webtbs/tw9261.pp b/tests/webtbs/tw9261.pp
index b1cfc78b70..68363b98da 100644
--- a/tests/webtbs/tw9261.pp
+++ b/tests/webtbs/tw9261.pp
@@ -7,7 +7,7 @@ type methodprocvar = function(): Boolean of object;
 procedure test_procedure(a1, a2, a3, a4, a5, a6: integer; mv: methodprocvar);
 begin
   with Tmethod(mv) do
-    if (code<>pointer($11111111)) or (data<>pointer($22222222)) then
+    if (code<>codepointer($11111111)) or (data<>pointer($22222222)) then
        begin
          writeln('test failed');
          halt(1);
@@ -19,7 +19,7 @@ var a:methodprocvar;
 begin
   with Tmethod(a) do
     begin
-      code:=pointer($11111111);
+      code:=codepointer($11111111);
       data:=pointer($22222222);
     end;
   test_procedure(1, 2, 3, 4, 5, 6, a);