Browse Source

* 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 -

Jonas Maebe 12 years ago
parent
commit
14b1c8a99c
5 changed files with 3 additions and 6 deletions
  1. 0 2
      rtl/inc/systemh.inc
  2. 1 0
      rtl/inc/thread.inc
  3. 1 1
      rtl/inc/threadh.inc
  4. 1 1
      rtl/inc/threadvr.inc
  5. 0 2
      rtl/java/jsystemh_types.inc

+ 0 - 2
rtl/inc/systemh.inc

@@ -539,8 +539,6 @@ const
 var
 var
 {$endif FPC_HAS_FEATURE_DYNLIBS}
 {$endif FPC_HAS_FEATURE_DYNLIBS}
   IsConsole : boolean = false; public name 'operatingsystem_isconsole';
   IsConsole : boolean = false; public name 'operatingsystem_isconsole';
-  { Threading support }
-  fpc_threadvar_relocate_proc : pointer; public name 'FPC_THREADVAR_RELOCATE';
 
 
   DefaultSystemCodePage,
   DefaultSystemCodePage,
   DefaultUnicodeCodePage,
   DefaultUnicodeCodePage,

+ 1 - 0
rtl/inc/thread.inc

@@ -16,6 +16,7 @@
 
 
 Var
 Var
   CurrentTM : TThreadManager;
   CurrentTM : TThreadManager;
+  fpc_threadvar_relocate_proc : TRelocateThreadVarHandler; public name 'FPC_THREADVAR_RELOCATE';
 
 
 {*****************************************************************************
 {*****************************************************************************
                            Threadvar initialization
                            Threadvar initialization

+ 1 - 1
rtl/inc/threadh.inc

@@ -105,7 +105,7 @@ Function SetThreadManager(Const NewTM : TThreadManager) : Boolean;
 {$ifndef DISABLE_NO_THREAD_MANAGER}
 {$ifndef DISABLE_NO_THREAD_MANAGER}
 {$endif DISABLE_NO_THREAD_MANAGER}
 {$endif DISABLE_NO_THREAD_MANAGER}
 // Needs to be exported, so the manager can call it.
 // Needs to be exported, so the manager can call it.
-procedure InitThreadVars(RelocProc : Pointer);
+procedure InitThreadVars(RelocProc : TRelocateThreadVarHandler);
 procedure InitThread(stklen:SizeUInt);
 procedure InitThread(stklen:SizeUInt);
 procedure DoneThread;
 procedure DoneThread;
 
 

+ 1 - 1
rtl/inc/threadvr.inc

@@ -100,7 +100,7 @@ begin
   end;
   end;
 end;
 end;
 
 
-procedure InitThreadVars(RelocProc : Pointer);
+procedure InitThreadVars(RelocProc : TRelocateThreadVarHandler);
 
 
 begin
 begin
    { initialize threadvars }
    { initialize threadvars }

+ 0 - 2
rtl/java/jsystemh_types.inc

@@ -530,8 +530,6 @@ const
 var
 var
 {$endif FPC_HAS_FEATURE_DYNLIBS}
 {$endif FPC_HAS_FEATURE_DYNLIBS}
   IsConsole : boolean = false; public name 'operatingsystem_isconsole';
   IsConsole : boolean = false; public name 'operatingsystem_isconsole';
-  { Threading support }
-  fpc_threadvar_relocate_proc : pointer; public name 'FPC_THREADVAR_RELOCATE';
 
 
   DefaultSystemCodePage,
   DefaultSystemCodePage,
   DefaultUnicodeCodePage,
   DefaultUnicodeCodePage,