diff --git a/rtl/bsd/ossysc.inc b/rtl/bsd/ossysc.inc index c164de2dad..7f91cc144d 100644 --- a/rtl/bsd/ossysc.inc +++ b/rtl/bsd/ossysc.inc @@ -443,7 +443,7 @@ end; data is function-dependent. } -Function FpIOCtl(Handle:cint;Ndx: culong;Data: Pointer):cint; [public, alias : 'FPC_SYSC_IOCTL']; +Function FpIOCtl(Handle:cint;Ndx: TIOCtlRequest;Data: Pointer):cint; [public, alias : 'FPC_SYSC_IOCTL']; // This was missing here, instead hardcoded in Do_IsDevice begin FpIOCtl:=do_SysCall(syscall_nr_ioctl,handle,Ndx,TSysParam(data)); diff --git a/rtl/darwin/ptypes.inc b/rtl/darwin/ptypes.inc index 752c2896d6..a02337d32c 100644 --- a/rtl/darwin/ptypes.inc +++ b/rtl/darwin/ptypes.inc @@ -33,6 +33,7 @@ type gid_t = cuint32; { used for group IDs } TGid = gid_t; pGid = ^gid_t; + TIOCtlRequest = cuLong; ino_t = cuint32; { used for file serial numbers } TIno = ino_t; diff --git a/rtl/freebsd/ptypes.inc b/rtl/freebsd/ptypes.inc index 0d731411e7..b4c86a0255 100644 --- a/rtl/freebsd/ptypes.inc +++ b/rtl/freebsd/ptypes.inc @@ -31,6 +31,7 @@ type gid_t = cuint32; { used for group IDs } TGid = gid_t; pGid = ^gid_t; + TIOCtlRequest = cuLong; {$ifdef CPU64} ino_t = cuint32; { used for file serial numbers } diff --git a/rtl/linux/ossysc.inc b/rtl/linux/ossysc.inc index 208c516abc..5f2232ac4f 100644 --- a/rtl/linux/ossysc.inc +++ b/rtl/linux/ossysc.inc @@ -510,7 +510,7 @@ end; // prototype is cint __P(cint,culong,....) // actual meaning of return value depends on request. -Function FpIOCtl(fd:cint;request:cint;Data: Pointer):cint; [public, alias : 'FPC_SYSC_IOCTL']; +Function FpIOCtl(fd:cint;request:TIOCtlRequest;Data: Pointer):cint; [public, alias : 'FPC_SYSC_IOCTL']; // This was missing here, instead hardcoded in Do_IsDevice begin FpIOCtl:=do_SysCall(syscall_nr_ioctl,tsysparam(fd),tsysparam(Request),TSysParam(data)); diff --git a/rtl/linux/ptypes.inc b/rtl/linux/ptypes.inc index f9896f1544..d7896c39e6 100644 --- a/rtl/linux/ptypes.inc +++ b/rtl/linux/ptypes.inc @@ -118,6 +118,8 @@ Type pUid = ^uid_t; TGid = gid_t; pGid = ^gid_t; + + TIOCtlRequest = cInt; socklen_t= cuint32; diff --git a/rtl/netbsd/ptypes.inc b/rtl/netbsd/ptypes.inc index 98a68cb5f3..c401a62dd6 100644 --- a/rtl/netbsd/ptypes.inc +++ b/rtl/netbsd/ptypes.inc @@ -31,6 +31,7 @@ type gid_t = cuint32; { used for group IDs } TGid = gid_t; pGid = ^gid_t; + TIOCtlRequest = cuLong; ino_t = clong; { used for file serial numbers } TIno = ino_t; diff --git a/rtl/openbsd/ptypes.inc b/rtl/openbsd/ptypes.inc index e0649c4562..d0e423bbac 100644 --- a/rtl/openbsd/ptypes.inc +++ b/rtl/openbsd/ptypes.inc @@ -31,6 +31,7 @@ type gid_t = cuint32; { used for group IDs } TGid = gid_t; pGid = ^gid_t; + TIOCtlRequest = cuLong; ino_t = clong; { used for file serial numbers } TIno = ino_t; diff --git a/rtl/solaris/ptypes.inc b/rtl/solaris/ptypes.inc index d53fccccba..216d3c5c8e 100644 --- a/rtl/solaris/ptypes.inc +++ b/rtl/solaris/ptypes.inc @@ -44,6 +44,7 @@ Type gid_t = cuint32; { used for group IDs } TGid = gid_t; pGid = ^gid_t; + TIOCtlRequest = cInt; ino_t = clong; { used for file serial numbers } TIno = ino_t; diff --git a/rtl/unix/aliasptp.inc b/rtl/unix/aliasptp.inc index 1b213d0ac6..1d62b8169e 100644 --- a/rtl/unix/aliasptp.inc +++ b/rtl/unix/aliasptp.inc @@ -23,6 +23,7 @@ type pDev = UnixType.pDev; gid_t = UnixType.gid_t; TGid = UnixType.TGid; + TIOCtlRequest = UnixType.TIOCtlRequest; pGid = UnixType.pGid; ino_t = UnixType.ino_t; TIno = UnixType.TIno; diff --git a/rtl/unix/bunxh.inc b/rtl/unix/bunxh.inc index 1058ef6f63..dc1e3098fb 100644 --- a/rtl/unix/bunxh.inc +++ b/rtl/unix/bunxh.inc @@ -90,11 +90,7 @@ Type TGrpArr = Array [0..0] of TGid; { C style array workarounds} Function FpFtruncate (fd : cInt; flength : TOff): cInt; external name 'FPC_SYSC_FTRUNCATE'; Function FPSigaction (sig: cInt; act : pSigActionRec; oact : pSigActionRec): cint; external name 'FPC_SYSC_SIGACTION'; Function FPSelect (N:cint;readfds,writefds,exceptfds:pfdSet;TimeOut:PTimeVal):cint; -{$ifdef BSD} - Function FpIOCtl (Handle:cint;Ndx: culong; Data: Pointer):cint; external name 'FPC_SYSC_IOCTL'; -{$else} - Function FpIOCtl (Handle:cint;Ndx: cInt; Data: Pointer):cint; external name 'FPC_SYSC_IOCTL'; -{$endif} + Function FpIOCtl (Handle:cint;Ndx: TIOCtlRequest; Data: Pointer):cint; external name 'FPC_SYSC_IOCTL'; Function FpNanoSleep (req : ptimespec;rem : ptimespec):cint; external name 'FPC_SYSC_NANOSLEEP'; Function fpLstat(path:pchar;Info:pstat):cint; Function fpLstat(Filename: ansistring;Info:pstat):cint; diff --git a/rtl/unix/oscdeclh.inc b/rtl/unix/oscdeclh.inc index 4c11a5f139..f8756ade56 100644 --- a/rtl/unix/oscdeclh.inc +++ b/rtl/unix/oscdeclh.inc @@ -74,11 +74,7 @@ const procedure FpExit (status : cint); cdecl; external clib name '_exit'; function fpmmap (addr:pointer;len:size_t;prot:cint;flags:cint;fd:cint;ofs:off_t):pointer; cdecl; external clib name 'mmap'+suffix64bit; function fpmunmap (addr:pointer;len:size_t):cint; cdecl; external clib name 'munmap'; -{$ifdef BSD} - function FpIOCtl (Handle:cint;Ndx: culong;Data: Pointer):cint; cdecl; external clib name 'ioctl'; -{$else} - function FpIOCtl (Handle:cint;Ndx: cint;Data: Pointer):cint; cdecl; external clib name 'ioctl'; -{$endif} + function FpIOCtl (Handle:cint;Ndx: TIOCtlRequest;Data: Pointer):cint; cdecl; external clib name 'ioctl'; {$ifdef beos} Function FPSelect (N:cint;readfds,writefds,exceptfds:pfdSet;TimeOut:PTimeVal):cint; cdecl; external 'net' name 'select'; {$else}