From 0c6fb09094995aca8906452e913231811b3aeab1 Mon Sep 17 00:00:00 2001 From: yury Date: Tue, 29 May 2007 17:03:03 +0000 Subject: [PATCH] * fixed compilation for wince. git-svn-id: trunk@7517 - --- rtl/inc/thread.inc | 4 ++++ rtl/inc/threadvr.inc | 2 ++ 2 files changed, 6 insertions(+) diff --git a/rtl/inc/thread.inc b/rtl/inc/thread.inc index e208ca9318..e2aac7ebac 100644 --- a/rtl/inc/thread.inc +++ b/rtl/inc/thread.inc @@ -24,8 +24,10 @@ Var procedure InitThread(stklen:SizeUInt); begin SysResetFPU; +{$ifndef HAS_MEMORYMANAGER} { initialize this thread's heap } InitHeapThread; +{$endif HAS_MEMORYMANAGER} if MemoryManager.InitThread <> nil then MemoryManager.InitThread(); { ExceptAddrStack and ExceptObjectStack are threadvars } @@ -43,7 +45,9 @@ Var procedure DoneThread; begin +{$ifndef HAS_MEMORYMANAGER} FinalizeHeap; +{$endif HAS_MEMORYMANAGER} if MemoryManager.DoneThread <> nil then MemoryManager.DoneThread(); CurrentTM.ReleaseThreadVars; diff --git a/rtl/inc/threadvr.inc b/rtl/inc/threadvr.inc index 50131104f3..df2b61229f 100644 --- a/rtl/inc/threadvr.inc +++ b/rtl/inc/threadvr.inc @@ -95,7 +95,9 @@ begin { install threadvar handler } fpc_threadvar_relocate_proc:=RelocProc; {$ifdef FPC_HAS_FEATURE_HEAP} +{$ifndef HAS_MEMORYMANAGER} RelocateHeap; +{$endif HAS_MEMORYMANAGER} {$endif} end;