Jelajahi Sumber

amicommon: AOS_heapPool renamed to ASYS_heapPool. common stuff should start with ASYS, to avoid confusion on AmigaOS, so more to come

git-svn-id: trunk@28533 -
Károly Balogh 11 tahun lalu
induk
melakukan
785a1690a2
4 mengubah file dengan 16 tambahan dan 16 penghapusan
  1. 2 2
      rtl/amicommon/sysheap.inc
  2. 4 4
      rtl/amiga/system.pp
  3. 6 6
      rtl/aros/system.pp
  4. 4 4
      rtl/morphos/system.pp

+ 2 - 2
rtl/amicommon/sysheap.inc

@@ -25,7 +25,7 @@ function SysOSAlloc(size: ptruint): pointer;
 var values: array[0..2] of dword;
 {$ENDIF}
 begin
-  result:=AllocPooled(AOS_heapPool,size);
+  result:=AllocPooled(ASYS_heapPool,size);
 {$IFDEF ASYS_FPC_MEMDEBUG}
   values[0]:=dword(result);
   values[1]:=dword(size);
@@ -41,7 +41,7 @@ procedure SysOSFree(p: pointer; size: ptruint);
 var values: array[0..2] of dword;
 {$ENDIF}
 begin
-  FreePooled(AOS_heapPool,p,size);
+  FreePooled(ASYS_heapPool,p,size);
 {$IFDEF ASYS_FPC_MEMDEBUG}
   values[0]:=dword(p);
   values[1]:=dword(size);

+ 4 - 4
rtl/amiga/system.pp

@@ -77,7 +77,7 @@ var
   IUtility : Pointer;
 {$ENDIF}
 
-  AOS_heapPool : Pointer; { pointer for the OS pool for growing the heap }
+  ASYS_heapPool : Pointer; { pointer for the OS pool for growing the heap }
   AOS_origDir  : LongInt; { original directory on startup }
   AOS_wbMsg    : Pointer; public name '_WBenchMsg'; { the "public" part is amunits compatibility kludge }
   _WBenchMsg   : Pointer; external name '_WBenchMsg'; { amunits compatibility kludge }
@@ -157,7 +157,7 @@ begin
   if AOS_IntuitionBase<>nil then CloseLibrary(AOS_IntuitionBase); { amunits kludge }
   if AOS_UtilityBase<>nil then CloseLibrary(AOS_UtilityBase);
   if AOS_DOSBase<>nil then CloseLibrary(AOS_DOSBase);
-  if AOS_heapPool<>nil then DeletePool(AOS_heapPool);
+  if ASYS_heapPool<>nil then DeletePool(ASYS_heapPool);
 
   { If in Workbench mode, replying WBMsg }
   if AOS_wbMsg<>nil then begin
@@ -343,8 +343,8 @@ begin
 {$ENDIF}
 
   { Creating the memory pool for growing heap }
-  AOS_heapPool:=CreatePool(MEMF_FAST,growheapsize2,growheapsize1);
-  if AOS_heapPool=nil then Halt(1);
+  ASYS_heapPool:=CreatePool(MEMF_FAST,growheapsize2,growheapsize1);
+  if ASYS_heapPool=nil then Halt(1);
 
   if AOS_wbMsg=nil then begin
     StdInputHandle:=dosInput;

+ 6 - 6
rtl/aros/system.pp

@@ -65,7 +65,7 @@ var
   AOS_UtilityBase: Pointer;
   
 
-  AOS_heapPool : Pointer; { pointer for the OS pool for growing the heap }
+  ASYS_heapPool : Pointer; { pointer for the OS pool for growing the heap }
   AOS_origDir  : LongInt; { original directory on startup }
   AOS_wbMsg    : Pointer;
   AOS_ConName  : PChar ='CON:10/30/620/100/FPC Console Output/AUTO/CLOSE/WAIT';
@@ -130,10 +130,10 @@ begin
   end;
   if AOS_UtilityBase <> nil then
     CloseLibrary(AOS_UtilityBase);
-  if AOS_heapPool <> nil then
-    DeletePool(AOS_heapPool);
+  if ASYS_heapPool <> nil then
+    DeletePool(ASYS_heapPool);
   AOS_UtilityBase := nil;
-  AOS_HeapPool := nil;
+  ASYS_HeapPool := nil;
   //
   if AOS_DOSBase<>nil then
     CloseLibrary(AOS_DOSBase);
@@ -398,8 +398,8 @@ begin
     AOS_ThreadBase := OpenLibrary('thread.library', 0);
     
   { Creating the memory pool for growing heap }
-  AOS_heapPool := CreatePool(MEMF_ANY or MEMF_SEM_PROTECTED, growheapsize2, growheapsize1);
-  if AOS_heapPool = nil then
+  ASYS_heapPool := CreatePool(MEMF_ANY or MEMF_SEM_PROTECTED, growheapsize2, growheapsize1);
+  if ASYS_heapPool = nil then
     Halt(1);
   
   if AOS_wbMsg = nil then begin

+ 4 - 4
rtl/morphos/system.pp

@@ -62,7 +62,7 @@ var
   AOS_DOSBase    : Pointer; external name 'AOS_DOSBASE'; { common Amiga code compatibility kludge }
   MOS_UtilityBase: Pointer;
 
-  AOS_heapPool : Pointer; { pointer for the OS pool for growing the heap }
+  ASYS_heapPool : Pointer; { pointer for the OS pool for growing the heap }
   AOS_origDir  : LongInt; { original directory on startup }
   MOS_ambMsg   : Pointer;
   MOS_ConName  : PChar ='CON:10/30/620/100/FPC Console Output/AUTO/CLOSE/WAIT';
@@ -115,7 +115,7 @@ begin
 
   if MOS_UtilityBase<>nil then CloseLibrary(MOS_UtilityBase);
   if MOS_DOSBase<>nil then CloseLibrary(MOS_DOSBase);
-  if AOS_heapPool<>nil then DeletePool(AOS_heapPool);
+  if ASYS_heapPool<>nil then DeletePool(ASYS_heapPool);
 
   { If in Ambient mode, replying WBMsg }
   if MOS_ambMsg<>nil then begin
@@ -358,8 +358,8 @@ begin
  if MOS_UtilityBase=nil then Halt(1);
 
  { Creating the memory pool for growing heap }
- AOS_heapPool:=CreatePool(MEMF_FAST,growheapsize2,growheapsize1);
- if AOS_heapPool=nil then Halt(1);
+ ASYS_heapPool:=CreatePool(MEMF_FAST,growheapsize2,growheapsize1);
+ if ASYS_heapPool=nil then Halt(1);
 
  if MOS_ambMsg=nil then begin
    MOS_ConHandle:=0;