15 files changed, 6 insertions, 190 deletions
diff --git a/packages/amunits/src/otherlibs/ahi_sub.pas b/packages/amunits/src/otherlibs/ahi_sub.pas
index 54f4a37619..de862b5702 100644
--- a/packages/amunits/src/otherlibs/ahi_sub.pas
+++ b/packages/amunits/src/otherlibs/ahi_sub.pas
@@ -30,11 +30,6 @@
 }
 {$PACKRECORDS 2}
 
-{$I useamigasmartlink.inc}
-{$ifdef use_amiga_smartlink}
-   {$smartlink on}
-{$endif use_amiga_smartlink}
-
 UNIT AHI_SUB;
 
 INTERFACE
diff --git a/packages/amunits/src/otherlibs/amarquee.pas b/packages/amunits/src/otherlibs/amarquee.pas
index 77522e8664..0a938db0a9 100644
--- a/packages/amunits/src/otherlibs/amarquee.pas
+++ b/packages/amunits/src/otherlibs/amarquee.pas
@@ -37,10 +37,6 @@
 
 }
 
-{$I useamigasmartlink.inc}
-{$ifdef use_amiga_smartlink}
-    {$smartlink on}
-{$endif use_amiga_smartlink}
 unit amarquee;
 
 
diff --git a/packages/amunits/src/otherlibs/cybergraphics.pas b/packages/amunits/src/otherlibs/cybergraphics.pas
index 4c35269e99..33dc245af8 100644
--- a/packages/amunits/src/otherlibs/cybergraphics.pas
+++ b/packages/amunits/src/otherlibs/cybergraphics.pas
@@ -218,14 +218,14 @@ const
      BMB_SPECIALFMT = 7;
      BMF_SPECIALFMT = 1 shl BMB_SPECIALFMT;
 
-FUNCTION AllocCModeListTagList(ModeListTags : pTagItem location 'a1') : pList; syscall CyberGfxBase 072;
+FUNCTION AllocCModeListTagList(ModeListTags : pTagItem location 'a1') : PCyberModeNode; syscall CyberGfxBase 072;
 FUNCTION BestCModeIDTagList(BestModeIDTags : pTagItem location 'a0') : longword; syscall CyberGfxBase 060;
 FUNCTION CModeRequestTagList(ModeRequest : POINTER location 'a0'; ModeRequestTags : pTagItem location 'a1') : longword; syscall CyberGfxBase 066;
 PROCEDURE CVideoCtrlTagList(ViewPort : pViewPort location 'a0'; TagList : pTagItem location 'a1'); syscall CyberGfxBase 162;
 PROCEDURE DoCDrawMethodTagList(Hook : pHook location 'a0'; a1arg : pRastPort location 'a1'; TagList : pTagItem location 'a2'); syscall CyberGfxBase 156;
 FUNCTION ExtractColor(a0arg : pRastPort location 'a0'; BitMap : pBitMap location 'a1'; Colour : longword location 'd0'; SrcX : longword location 'd1'; SrcY : longword location 'd2'; Width : longword location 'd3'; Height : longword location 'd4') : longword; syscall CyberGfxBase 186;
 FUNCTION FillPixelArray(a1arg : pRastPort location 'a1'; DestX : WORD location 'd0'; DestY : WORD location 'd1'; SizeX : WORD location 'd2'; SizeY : WORD location 'd3'; ARGB : longword location 'd4') : longword; syscall CyberGfxBase 150;
-PROCEDURE FreeCModeList(ModeList : pList location 'a0'); syscall CyberGfxBase 078;
+PROCEDURE FreeCModeList(ModeList : PCyberModeNode location 'a0'); syscall CyberGfxBase 078;
 FUNCTION GetCyberIDAttr(CyberIDAttr : longword location 'd0'; CyberDisplayModeID : longword location 'd1') : longword; syscall CyberGfxBase 102;
 FUNCTION GetCyberMapAttr(CyberGfxBitmap : pBitMap location 'a0'; CyberAttrTag : longword location 'd0') : longword; syscall CyberGfxBase 096;
 FUNCTION InvertPixelArray(a1arg : pRastPort location 'a1'; DestX : WORD location 'd0'; DestY : WORD location 'd1'; SizeX : WORD location 'd2'; SizeY : WORD location 'd3') : longword; syscall CyberGfxBase 144;
@@ -243,7 +243,7 @@ FUNCTION WriteRGBPixel(a1arg : pRastPort location 'a1'; x : WORD location 'd0';
 {
  Functions and procedures with array of PtrUInt go here
 }
-FUNCTION AllocCModeListTags(const ModeListTags : array of PtrUInt) : pList;
+FUNCTION AllocCModeListTags(const ModeListTags : array of PtrUInt) : PCyberModeNode;
 FUNCTION BestCModeIDTags(const BestModeIDTags : array of PtrUInt) : longword;
 FUNCTION CModeRequestTags(ModeRequest : POINTER; const ModeRequestTags : array of PtrUInt) : longword;
 PROCEDURE CVideoCtrlTags(ViewPort : pViewPort; const TagList : array of PtrUInt);
@@ -258,7 +258,7 @@ IMPLEMENTATION
 {
  Functions and procedures with array of PtrUInt go here
 }
-FUNCTION AllocCModeListTags(const ModeListTags : array of PtrUInt) : pList;
+FUNCTION AllocCModeListTags(const ModeListTags : array of PtrUInt) : PCyberModeNode;
 begin
     AllocCModeListTags := AllocCModeListTagList(@ModeListTags);
 end;
diff --git a/packages/amunits/src/useamigasmartlink.inc b/packages/amunits/src/useamigasmartlink.inc
deleted file mode 100644
index 1e83bf4583..0000000000
--- a/packages/amunits/src/useamigasmartlink.inc
+++ /dev/null
@@ -1,40 +0,0 @@
-
-{  useamigasmartlink.inc }
-
-{
-    This file is part of the Free Pascal run time library.
-
-    A file in Amiga system run time library.
-    Copyright (c) 2003 by Nils Sjoholm
-    member of the Amiga RTL development team.
-
-    See the file COPYING.FPC, included in this distribution,
-    for details about the copyright.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
- **********************************************************************}
-
-{
-   This includefile sets the define use_amiga_smartlink.
-
-   This way I can be sure that all units that reads
-   this includefile is compiled with smartlink.
-
-   If you don't want smartlink just put a space before
-   $define use_amiga_smartlink.
-
-   11 Jan 2003.
-
-   nils.sjoholm@mailbox.swipnet.se
-
-}
-
-{$ifndef use_amiga_smartlink}
-   {$define use_amiga_smartlink}
-{$endif}
-
-
-
diff --git a/packages/amunits/src/useautoopenlib.inc b/packages/amunits/src/useautoopenlib.inc
deleted file mode 100644
index ee82adfe3b..0000000000
--- a/packages/amunits/src/useautoopenlib.inc
+++ /dev/null
@@ -1,87 +0,0 @@
-
-{  useautoopenlib.inc }
-
-{
-    This file is part of the Free Pascal run time library.
-
-    A file in Amiga system run time library.
-    Copyright (c) 2003 by Nils Sjoholm
-    member of the Amiga RTL development team.
-
-    See the file COPYING.FPC, included in this distribution,
-    for details about the copyright.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
- **********************************************************************}
-
-{
-   In this includefile you can set some defines on how
-   to compile amiga units.
-
-   use_auto_openlib.
-   If you use use_auto_openlib the unit will compile
-   with autoopening of the unit at startup. You don't
-   have to think about open and close the library, all
-   is done in the unit. One problem is that the library
-   will be loaded at startup so there can be a memory-
-   problem. As default I have compiled all amiga system
-   units as autoopened. Exec, intuition, amigados and
-   utility is all opened on startup by sysamiga.
-
-
-   use_init_openlib.
-   If you compile with this define you get a procedure
-   in every unit as an example for asl.library you
-   have "procedure InitAslLibrary;". All you have to
-   do is
-   InitAslLibrary in the beginning of your program.
-   You don't have to close the library the unit will
-   handle that.
-
-   dont_use_openlib.
-   This is the standard amiga way. You have to open
-   the library yourself and at the end close it.
-
-   When you compile a unit you will get warnings or
-   info on how the defines are set.
-
-   First version of this include.
-   11 Jan 2003.
-
-   Added use_init_openlib and dont_use_openlib.
-   21 Jan 2003.
-
-   nils.sjoholm@mailbox.swipnet.se
-
-}
-
-{
-   Make sure that there is only one define set.
-   Just put a space before the define to undef
-}
-
-{$define use_auto_openlib}
-{ $define use_init_openlib}
-{ $define dont_use_openlib}
-
-{$ifdef use_auto_openlib}
-   {$undef use_init_openlib}
-   {$undef use_init_openlib}
-{$endif use_auto_openlib}
-
-{$ifdef use_init_openlib}
-   {$undef use_auto_openlib}
-   {$undef dont_use_openlib}
-{$endif use_init_openlib}
-
-{$ifdef dont_use_openlib}
-   {$undef use_auto_openlib}
-   {$undef use_init_openlib}
-{$endif dont_use_openlib}
-
-
-
-
diff --git a/packages/amunits/src/utilunits/amigautils.pas b/packages/amunits/src/utilunits/amigautils.pas
index d9f4df022d..c30be2f626 100644
--- a/packages/amunits/src/utilunits/amigautils.pas
+++ b/packages/amunits/src/utilunits/amigautils.pas
@@ -24,11 +24,6 @@
    nils.sjoholm@mailbox.swipnet.se
 }
 
-{$I useamigasmartlink.inc}
-{$ifdef use_amiga_smartlink}
-    {$smartlink on}
-{$endif use_amiga_smartlink}
-
 unit amigautils;
 
 interface
diff --git a/packages/amunits/src/utilunits/consoleio.pas b/packages/amunits/src/utilunits/consoleio.pas
index ca9ed258bf..639ab4998d 100644
--- a/packages/amunits/src/utilunits/consoleio.pas
+++ b/packages/amunits/src/utilunits/consoleio.pas
@@ -34,11 +34,6 @@ unit consoleio;
 
 }
 
-{$I useamigasmartlink.inc}
-{$ifdef use_amiga_smartlink}
-    {$smartlink on}
-{$endif use_amiga_smartlink}
-
 interface
 
 uses exec, intuition, console, amigalib, conunit;
diff --git a/packages/amunits/src/utilunits/doublebuffer.pas b/packages/amunits/src/utilunits/doublebuffer.pas
index ca304cf522..566ef96374 100644
--- a/packages/amunits/src/utilunits/doublebuffer.pas
+++ b/packages/amunits/src/utilunits/doublebuffer.pas
@@ -14,11 +14,6 @@
 
  **********************************************************************}
 
-{$I useamigasmartlink.inc}
-{$ifdef use_amiga_smartlink}
-    {$smartlink on}
-{$endif use_amiga_smartlink}
-
 unit doublebuffer;
 
 
diff --git a/packages/amunits/src/utilunits/easyasl.pas b/packages/amunits/src/utilunits/easyasl.pas
index 4f44547b29..466e76399d 100644
--- a/packages/amunits/src/utilunits/easyasl.pas
+++ b/packages/amunits/src/utilunits/easyasl.pas
@@ -33,11 +33,6 @@
     nils.sjoholm@mailbox.swipnet.se
 }
 
-{$I useamigasmartlink.inc}
-{$ifdef use_amiga_smartlink}
-    {$smartlink on}
-{$endif use_amiga_smartlink}
-
 unit easyasl;
 
 
diff --git a/packages/amunits/src/utilunits/hisoft.pas b/packages/amunits/src/utilunits/hisoft.pas
index e30fd35a7d..2f344a9782 100644
--- a/packages/amunits/src/utilunits/hisoft.pas
+++ b/packages/amunits/src/utilunits/hisoft.pas
@@ -26,11 +26,6 @@
         nils.sjoholm@mailbox.swipnet.se Nils Sjoholm
 }
 
-{$I useamigasmartlink.inc}
-{$ifdef use_amiga_smartlink}
-    {$smartlink on}
-{$endif use_amiga_smartlink}
-
 unit hisoft;
 
 interface
diff --git a/packages/amunits/src/utilunits/linklist.pas b/packages/amunits/src/utilunits/linklist.pas
index 4e7fbe8a83..263bbcee9e 100644
--- a/packages/amunits/src/utilunits/linklist.pas
+++ b/packages/amunits/src/utilunits/linklist.pas
@@ -14,10 +14,6 @@
 
  **********************************************************************}
 
-{$I useamigasmartlink.inc}
-{$ifdef use_amiga_smartlink}
-    {$smartlink on}
-{$endif use_amiga_smartlink}
 
 unit linklist;
 
diff --git a/packages/amunits/src/utilunits/pastoc.pas b/packages/amunits/src/utilunits/pastoc.pas
index 1264515c43..e6fd71535a 100644
--- a/packages/amunits/src/utilunits/pastoc.pas
+++ b/packages/amunits/src/utilunits/pastoc.pas
@@ -22,11 +22,6 @@
     nils.sjoholm@mailbox.swipnet.se Nils Sjoholm
 }
 
-{$I useamigasmartlink.inc}
-{$ifdef use_amiga_smartlink}
-    {$smartlink on}
-{$endif use_amiga_smartlink}
-
 {
   This unit must be deprecated because at least:
   - It is leaking memory. It allocates a new buffer for each string which won't
@@ -34,9 +29,9 @@
   - The unit doesn't provide any way to free allocated string buffers manually.
     (Because ReleasePas2C is not a public function.)
   - It does allocations outside the Pascal heap, which the compiler has no control
-    over, and makes it very hard to track these allocations, because the heaptrc 
+    over, and makes it very hard to track these allocations, because the heaptrc
     unit doesn't work.
-  - The intuition.library documentation states that AllocRemember() is a quite 
+  - The intuition.library documentation states that AllocRemember() is a quite
     ineffective function, because it does two memory allocations and because it
     doesn't use memory pools it has a terrible effect on memory fragmentation.
   - It uses a for loop byte to copy the string contents, which is very slow.
diff --git a/packages/amunits/src/utilunits/timerutils.pas b/packages/amunits/src/utilunits/timerutils.pas
index 8b34d872ee..971ef13262 100644
--- a/packages/amunits/src/utilunits/timerutils.pas
+++ b/packages/amunits/src/utilunits/timerutils.pas
@@ -14,11 +14,6 @@
 
  **********************************************************************}
 
-{$I useamigasmartlink.inc}
-{$ifdef use_amiga_smartlink}
-    {$smartlink on}
-{$endif use_amiga_smartlink}
-
 unit timerutils;
 
 {
diff --git a/packages/amunits/src/utilunits/vartags.pas b/packages/amunits/src/utilunits/vartags.pas
index 22e9a97f44..e5701c9208 100644
--- a/packages/amunits/src/utilunits/vartags.pas
+++ b/packages/amunits/src/utilunits/vartags.pas
@@ -13,10 +13,6 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
-{$I useamigasmartlink.inc}
-{$ifdef use_amiga_smartlink}
-    {$smartlink on}
-{$endif use_amiga_smartlink}
 
 unit vartags;
 
diff --git a/packages/amunits/src/utilunits/wbargs.pas b/packages/amunits/src/utilunits/wbargs.pas
index fe47f622e8..e2ff3ad78f 100644
--- a/packages/amunits/src/utilunits/wbargs.pas
+++ b/packages/amunits/src/utilunits/wbargs.pas
@@ -29,11 +29,6 @@
      nils.sjoholm@mailbox.swipnet.se Nils Sjoholm
 }
 
-{$I useamigasmartlink.inc}
-{$ifdef use_amiga_smartlink}
-    {$smartlink on}
-{$endif use_amiga_smartlink}
-
 unit WBArgs;
 
 interface