From 14b1c8a99c3fa1c7ef995cb55176563c2a94cdc5 Mon Sep 17 00:00:00 2001
From: Jonas Maebe <jonas@freepascal.org>
Date: Sun, 9 Dec 2012 22:42:46 +0000
Subject: [PATCH]   * moved fpc_threadvar_relocate_proc from systemh.inc to
 thread.inc     and gave it the correct type (TRelocateThreadVarHandler)   *
 changed parameter type of InitThread also to TRelocateThreadVarHandler

git-svn-id: trunk@23130 -
---
 rtl/inc/systemh.inc         | 2 --
 rtl/inc/thread.inc          | 1 +
 rtl/inc/threadh.inc         | 2 +-
 rtl/inc/threadvr.inc        | 2 +-
 rtl/java/jsystemh_types.inc | 2 --
 5 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/rtl/inc/systemh.inc b/rtl/inc/systemh.inc
index ad7a131933..9d77b00f16 100644
--- a/rtl/inc/systemh.inc
+++ b/rtl/inc/systemh.inc
@@ -539,8 +539,6 @@ const
 var
 {$endif FPC_HAS_FEATURE_DYNLIBS}
   IsConsole : boolean = false; public name 'operatingsystem_isconsole';
-  { Threading support }
-  fpc_threadvar_relocate_proc : pointer; public name 'FPC_THREADVAR_RELOCATE';
 
   DefaultSystemCodePage,
   DefaultUnicodeCodePage,
diff --git a/rtl/inc/thread.inc b/rtl/inc/thread.inc
index c63efea91e..a564743249 100644
--- a/rtl/inc/thread.inc
+++ b/rtl/inc/thread.inc
@@ -16,6 +16,7 @@
 
 Var
   CurrentTM : TThreadManager;
+  fpc_threadvar_relocate_proc : TRelocateThreadVarHandler; public name 'FPC_THREADVAR_RELOCATE';
 
 {*****************************************************************************
                            Threadvar initialization
diff --git a/rtl/inc/threadh.inc b/rtl/inc/threadh.inc
index 5eb864905b..e83443273a 100644
--- a/rtl/inc/threadh.inc
+++ b/rtl/inc/threadh.inc
@@ -105,7 +105,7 @@ Function SetThreadManager(Const NewTM : TThreadManager) : Boolean;
 {$ifndef DISABLE_NO_THREAD_MANAGER}
 {$endif DISABLE_NO_THREAD_MANAGER}
 // Needs to be exported, so the manager can call it.
-procedure InitThreadVars(RelocProc : Pointer);
+procedure InitThreadVars(RelocProc : TRelocateThreadVarHandler);
 procedure InitThread(stklen:SizeUInt);
 procedure DoneThread;
 
diff --git a/rtl/inc/threadvr.inc b/rtl/inc/threadvr.inc
index 02af72e96d..406afa1f24 100644
--- a/rtl/inc/threadvr.inc
+++ b/rtl/inc/threadvr.inc
@@ -100,7 +100,7 @@ begin
   end;
 end;
 
-procedure InitThreadVars(RelocProc : Pointer);
+procedure InitThreadVars(RelocProc : TRelocateThreadVarHandler);
 
 begin
    { initialize threadvars }
diff --git a/rtl/java/jsystemh_types.inc b/rtl/java/jsystemh_types.inc
index e52369d625..2e4ff9dfd5 100644
--- a/rtl/java/jsystemh_types.inc
+++ b/rtl/java/jsystemh_types.inc
@@ -530,8 +530,6 @@ const
 var
 {$endif FPC_HAS_FEATURE_DYNLIBS}
   IsConsole : boolean = false; public name 'operatingsystem_isconsole';
-  { Threading support }
-  fpc_threadvar_relocate_proc : pointer; public name 'FPC_THREADVAR_RELOCATE';
 
   DefaultSystemCodePage,
   DefaultUnicodeCodePage,