diff --git a/rtl/aix/termio.pp b/rtl/aix/termio.pp index 0d734f414b..61256a0a21 100644 --- a/rtl/aix/termio.pp +++ b/rtl/aix/termio.pp @@ -30,7 +30,7 @@ Uses UnixType,BaseUnix,ctypes; // load base unix typing implementation -{$i textrec.inc} + // load implementation for prototypes from current dir. {$i termiosproc.inc} diff --git a/rtl/amiga/crt.pp b/rtl/amiga/crt.pp index 845a34f3cb..56dc26c5e5 100644 --- a/rtl/amiga/crt.pp +++ b/rtl/amiga/crt.pp @@ -40,12 +40,6 @@ Const Implementation -{ - The definitions of TextRec and FileRec are in separate files. -} -{$i textrec.inc} -{$i filerec.inc} - var maxcols,maxrows : longint; diff --git a/rtl/android/cwstring.pp b/rtl/android/cwstring.pp index 86c012760f..09c3ad8754 100644 --- a/rtl/android/cwstring.pp +++ b/rtl/android/cwstring.pp @@ -361,7 +361,6 @@ begin Result := CP_UTF8; // Android always uses UTF-8 end; -{$i textrec.inc} procedure SetStdIOCodePage(var T: Text); inline; begin case TextRec(T).Mode of diff --git a/rtl/beos/termio.pp b/rtl/beos/termio.pp index ebd1913c32..7c32a25562 100644 --- a/rtl/beos/termio.pp +++ b/rtl/beos/termio.pp @@ -30,8 +30,6 @@ Uses BaseUnix; // load base unix typing implementation -{$i textrec.inc} - // load implementation for prototypes from current dir. {$i termiosproc.inc} diff --git a/rtl/darwin/termio.pp b/rtl/darwin/termio.pp index f27a034d3c..f9265794d1 100644 --- a/rtl/darwin/termio.pp +++ b/rtl/darwin/termio.pp @@ -31,8 +31,6 @@ Uses BaseUnix; // load base unix typing implementation -{$i textrec.inc} - // load implementation for prototypes from current dir. {$i termiosproc.inc} diff --git a/rtl/emx/crt.pas b/rtl/emx/crt.pas index b64f3aab78..cbb8b61b32 100644 --- a/rtl/emx/crt.pas +++ b/rtl/emx/crt.pas @@ -30,8 +30,6 @@ var implementation -{$i textrec.inc} - const extkeycode:char=#0; var maxrows,maxcols:word; diff --git a/rtl/freebsd/termio.pp b/rtl/freebsd/termio.pp index 707bd0da10..f2fa007789 100644 --- a/rtl/freebsd/termio.pp +++ b/rtl/freebsd/termio.pp @@ -30,8 +30,6 @@ Uses BaseUnix; // load base unix typing implementation -{$i textrec.inc} - // load implementation for prototypes from current dir. {$i termiosproc.inc} diff --git a/rtl/go32v2/crt.pp b/rtl/go32v2/crt.pp index e122c3cef1..766f344322 100644 --- a/rtl/go32v2/crt.pp +++ b/rtl/go32v2/crt.pp @@ -33,12 +33,6 @@ var DelayCnt : Longint; VidSeg : Word; -{ - definition of textrec is in textrec.inc -} -{$i textrec.inc} - - {**************************************************************************** Low level Routines ****************************************************************************} diff --git a/rtl/haiku/termio.pp b/rtl/haiku/termio.pp index ebd1913c32..7c32a25562 100644 --- a/rtl/haiku/termio.pp +++ b/rtl/haiku/termio.pp @@ -30,8 +30,6 @@ Uses BaseUnix; // load base unix typing implementation -{$i textrec.inc} - // load implementation for prototypes from current dir. {$i termiosproc.inc} diff --git a/rtl/inc/dosh.inc b/rtl/inc/dosh.inc index 7b901fe007..4eb98b8080 100644 --- a/rtl/inc/dosh.inc +++ b/rtl/inc/dosh.inc @@ -63,15 +63,6 @@ Type NameStr = String[FileNameLen]; ExtStr = String[FileNameLen]; -{ - filerec.inc contains the definition of the filerec. - textrec.inc contains the definition of the textrec. - It is in a separate file to make it available in other units without - having to use the DOS unit for it. -} -{$i filerec.inc} -{$i textrec.inc} - DateTime = packed record Year, Month, diff --git a/rtl/inc/iso7185.pp b/rtl/inc/iso7185.pp index 8031567d10..0bdf64fa43 100644 --- a/rtl/inc/iso7185.pp +++ b/rtl/inc/iso7185.pp @@ -44,8 +44,6 @@ unit iso7185; implementation - {$i textrec.inc} - {$i-} procedure DoAssign(var t : Text); begin diff --git a/rtl/inc/lstrings.pp b/rtl/inc/lstrings.pp index 013911f19c..42765ce776 100644 --- a/rtl/inc/lstrings.pp +++ b/rtl/inc/lstrings.pp @@ -37,8 +37,6 @@ Interface Type longstring = pchar; ShortString = string; -{$i textrec.inc} - { Internal functions, will not appear in systemh.inc } Function NewLongString (Len : Longint) : LongString; diff --git a/rtl/linux/oldlinux.pp b/rtl/linux/oldlinux.pp index f404588cdc..1a87825725 100644 --- a/rtl/linux/oldlinux.pp +++ b/rtl/linux/oldlinux.pp @@ -1627,10 +1627,6 @@ Implementation Uses Strings; -{ Get the definitions of textrec and filerec } -{$i textrec.inc} -{$i filerec.inc} - {No debugging for syslinux include !} {$IFDEF SYS_LINUX} {$UNDEF SYSCALL_DEBUG} diff --git a/rtl/linux/termio.pp b/rtl/linux/termio.pp index 98c1089f96..cce0c95789 100644 --- a/rtl/linux/termio.pp +++ b/rtl/linux/termio.pp @@ -31,8 +31,6 @@ Uses BaseUnix; // load base unix typing implementation -{$i textrec.inc} - // load implementation for prototypes from current dir. {$i termiosproc.inc} diff --git a/rtl/morphos/sockets.pp b/rtl/morphos/sockets.pp index 099209462a..d0c99e29c7 100644 --- a/rtl/morphos/sockets.pp +++ b/rtl/morphos/sockets.pp @@ -132,9 +132,6 @@ Implementation threadvar internal_socketerror : cint; -{ Include filerec and textrec structures } -{$i filerec.inc} -{$i textrec.inc} {****************************************************************************** Kernel Socket Callings ******************************************************************************} diff --git a/rtl/msdos/crt.pp b/rtl/msdos/crt.pp index abdd8714a4..a89a0d525d 100644 --- a/rtl/msdos/crt.pp +++ b/rtl/msdos/crt.pp @@ -35,12 +35,6 @@ var DelayCnt : Longint; VidSeg : Word; -{ - definition of textrec is in textrec.inc -} -{$i textrec.inc} - - {**************************************************************************** Low level Routines ****************************************************************************} diff --git a/rtl/netbsd/termio.pp b/rtl/netbsd/termio.pp index f27a034d3c..f9265794d1 100644 --- a/rtl/netbsd/termio.pp +++ b/rtl/netbsd/termio.pp @@ -31,8 +31,6 @@ Uses BaseUnix; // load base unix typing implementation -{$i textrec.inc} - // load implementation for prototypes from current dir. {$i termiosproc.inc} diff --git a/rtl/netware/crt.pp b/rtl/netware/crt.pp index 27500d41b3..179924198b 100644 --- a/rtl/netware/crt.pp +++ b/rtl/netware/crt.pp @@ -44,12 +44,6 @@ var // ScreenHeight : longint; VidSeg : Word; -{ - definition of textrec is in textrec.inc -} -{$i textrec.inc} - - {**************************************************************************** Low level Routines ****************************************************************************} diff --git a/rtl/netware/netware.pp b/rtl/netware/netware.pp index 9eed8db0bb..510d8623be 100644 --- a/rtl/netware/netware.pp +++ b/rtl/netware/netware.pp @@ -44,11 +44,6 @@ Function GetFS(Var F:File):longint; implementation -{ Get the definitions of textrec and filerec } -{$i textrec.inc} -{$i filerec.inc} - - Function Select(N:longint;readfds,writefds,exceptfds:PFDSet;TimeOut:Longint):longint; { Select checks whether the file descriptor sets in readfs/writefs/exceptfs diff --git a/rtl/netware/sockets.pp b/rtl/netware/sockets.pp index 547ed810c4..640135c0a4 100644 --- a/rtl/netware/sockets.pp +++ b/rtl/netware/sockets.pp @@ -55,10 +55,6 @@ const Implementation -{ Include filerec and textrec structures } -{$i filerec.inc} -{$i textrec.inc} - {****************************************************************************** Basic Socket Functions ******************************************************************************} diff --git a/rtl/netwlibc/crt.pp b/rtl/netwlibc/crt.pp index f558feff56..11f06d3105 100644 --- a/rtl/netwlibc/crt.pp +++ b/rtl/netwlibc/crt.pp @@ -33,9 +33,6 @@ uses Libc; var ScreenHandle : scr_t; -{ Definition of textrec is in textrec.inc } -{$i textrec.inc} - {**************************************************************************** Low level Routines diff --git a/rtl/netwlibc/sockets.pp b/rtl/netwlibc/sockets.pp index e864c2f3ce..ab8bb76a53 100644 --- a/rtl/netwlibc/sockets.pp +++ b/rtl/netwlibc/sockets.pp @@ -55,10 +55,6 @@ const Implementation -{ Include filerec and textrec structures } -{$i filerec.inc} -{$i textrec.inc} - {****************************************************************************** Basic Socket Functions ******************************************************************************} diff --git a/rtl/objpas/sysutils/sysutilh.inc b/rtl/objpas/sysutils/sysutilh.inc index d6e997ffd2..bd621bdac3 100644 --- a/rtl/objpas/sysutils/sysutilh.inc +++ b/rtl/objpas/sysutils/sysutilh.inc @@ -253,10 +253,6 @@ type Var OnShowException : Procedure (Msg : ShortString); - { FileRec/TextRec } - {$i filerec.inc} - {$i textrec.inc} - Const HexDisplayPrefix : string = '$'; diff --git a/rtl/openbsd/termio.pp b/rtl/openbsd/termio.pp index f27a034d3c..f9265794d1 100644 --- a/rtl/openbsd/termio.pp +++ b/rtl/openbsd/termio.pp @@ -31,8 +31,6 @@ Uses BaseUnix; // load base unix typing implementation -{$i textrec.inc} - // load implementation for prototypes from current dir. {$i termiosproc.inc} diff --git a/rtl/os2/crt.pas b/rtl/os2/crt.pas index 67e2145a0b..a7dc1d1d55 100644 --- a/rtl/os2/crt.pas +++ b/rtl/os2/crt.pas @@ -33,9 +33,6 @@ implementation {uses keyboard, video;} - -{$i textrec.inc} - const VioHandle: word = 0; diff --git a/rtl/os2/sockets.pas b/rtl/os2/sockets.pas index 97ae5414b6..99bf16c378 100644 --- a/rtl/os2/sockets.pas +++ b/rtl/os2/sockets.pas @@ -587,10 +587,6 @@ Implementation uses DosCalls; -{Include filerec and textrec structures} -{$I filerec.inc} -{$I textrec.inc} - {****************************************************************************** Basic Socket Functions ******************************************************************************} diff --git a/rtl/solaris/termio.pp b/rtl/solaris/termio.pp index e0a8544baf..c3bff7cf8c 100644 --- a/rtl/solaris/termio.pp +++ b/rtl/solaris/termio.pp @@ -30,8 +30,6 @@ Uses UnixType,BaseUnix; // load base unix typing implementation -{$i textrec.inc} - // load implementation for prototypes from current dir. {$i termiosproc.inc} diff --git a/rtl/unix/bunxovl.inc b/rtl/unix/bunxovl.inc index 1ff7b198ba..12025aad32 100644 --- a/rtl/unix/bunxovl.inc +++ b/rtl/unix/bunxovl.inc @@ -13,9 +13,6 @@ **********************************************************************} -{$I textrec.inc} -{$I filerec.inc} - Function FpLink (const existing : RawByteString; const newone : RawByteString): cInt; {$ifdef VER2_0}inline;{$endif} var SystemExistingFileName, SystemNewOneFileName: RawByteString; diff --git a/rtl/unix/crt.pp b/rtl/unix/crt.pp index 33ff168842..f7bb1057e7 100644 --- a/rtl/unix/crt.pp +++ b/rtl/unix/crt.pp @@ -40,11 +40,6 @@ Implementation uses BaseUnix ,unix, termio; -{ - The definitions of TextRec and FileRec are in separate files. -} -{$i textrec.inc} - Const OldTextAttr : byte = $07; Var diff --git a/rtl/unix/cwstring.pp b/rtl/unix/cwstring.pp index 736eb9416e..16f50a4a60 100644 --- a/rtl/unix/cwstring.pp +++ b/rtl/unix/cwstring.pp @@ -1,4 +1,4 @@ -{ +»¿{ This file is part of the Free Pascal run time library. Copyright (c) 2005 by Florian Klaempfl, member of the Free Pascal development team. @@ -1010,7 +1010,7 @@ begin end; {$ifdef FPC_HAS_CPSTRING} -{$i textrec.inc} + procedure SetStdIOCodePage(var T: Text); inline; begin case TextRec(T).Mode of diff --git a/rtl/unix/printer.pp b/rtl/unix/printer.pp index f0c1c9c288..7b4cde0269 100644 --- a/rtl/unix/printer.pp +++ b/rtl/unix/printer.pp @@ -63,8 +63,6 @@ Uses Unix,BaseUnix,Strings; { include definition of textrec } -{$i textrec.inc} - Const P_TOF = 1; { Print to file } diff --git a/rtl/unix/sockets.pp b/rtl/unix/sockets.pp index 48337b5a5a..2888aea723 100644 --- a/rtl/unix/sockets.pp +++ b/rtl/unix/sockets.pp @@ -79,9 +79,6 @@ Uses {$ifndef FPC_USE_LIBC}SysCall{$else}initc{$endif}; threadvar internal_socketerror : cint; -{ Include filerec and textrec structures } -{$i filerec.inc} -{$i textrec.inc} {****************************************************************************** Kernel Socket Callings ******************************************************************************} diff --git a/rtl/unix/unix.pp b/rtl/unix/unix.pp index a0dae294f6..e3f9a76f9d 100644 --- a/rtl/unix/unix.pp +++ b/rtl/unix/unix.pp @@ -162,10 +162,6 @@ Uses {$i unxsysc.inc} {$endif} -{ Get the definitions of textrec and filerec } -{$i textrec.inc} -{$i filerec.inc} - {$i unxfunc.inc} { Platform specific implementations } Function getenv(name:string):Pchar; external name 'FPC_SYSC_FPGETENV'; diff --git a/rtl/unix/unixutil.pp b/rtl/unix/unixutil.pp index 74dd8c3c2f..7b5d706c77 100644 --- a/rtl/unix/unixutil.pp +++ b/rtl/unix/unixutil.pp @@ -49,9 +49,6 @@ Function GregorianToJulian(Year,Month,Day:Longint):LongInt; implementation -{$I textrec.inc} -{$i filerec.inc} - function ArrayStringToPPchar(const S:Array of AnsiString;reserveentries:Longint):ppchar; // const ? // Extra allocate reserveentries pchar's at the beginning (default param=0 after 1.0.x ?) // Note: for internal use by skilled programmers only diff --git a/rtl/watcom/crt.pp b/rtl/watcom/crt.pp index 2cb0da934f..100dd4b3ea 100644 --- a/rtl/watcom/crt.pp +++ b/rtl/watcom/crt.pp @@ -22,12 +22,6 @@ var ScreenHeight : longint; VidSeg : Word; -{ - definition of textrec is in textrec.inc -} -{$i textrec.inc} - - {**************************************************************************** Low level Routines ****************************************************************************} diff --git a/rtl/win/crt.pp b/rtl/win/crt.pp index c0452a3a56..b9bd9e177f 100644 --- a/rtl/win/crt.pp +++ b/rtl/win/crt.pp @@ -31,12 +31,6 @@ uses var SaveCursorSize: Longint; - -{ - definition of textrec is in textrec.inc -} -{$i textrec.inc} - {**************************************************************************** Low level Routines ****************************************************************************} diff --git a/rtl/win/sockets.pp b/rtl/win/sockets.pp index b857bf6e6a..18e19a799d 100644 --- a/rtl/win/sockets.pp +++ b/rtl/win/sockets.pp @@ -59,10 +59,6 @@ var Implementation -{ Include filerec and textrec structures } -{$i filerec.inc} -{$i textrec.inc} - {****************************************************************************** Basic Socket Functions ******************************************************************************}