Jelajahi Sumber

* fixed compilation for wince.

git-svn-id: trunk@7517 -
yury 18 tahun lalu
induk
melakukan
0c6fb09094
2 mengubah file dengan 6 tambahan dan 0 penghapusan
  1. 4 0
      rtl/inc/thread.inc
  2. 2 0
      rtl/inc/threadvr.inc

+ 4 - 0
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;

+ 2 - 0
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;