Browse Source

* use TIOCtlRequest instead of hard ifdefs to remove warnings

git-svn-id: trunk@8679 -
Almindor 18 years ago
parent
commit
fdcc5f4332

+ 1 - 1
rtl/bsd/ossysc.inc

@@ -443,7 +443,7 @@ end;
   data is function-dependent.
   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
 // This was missing here, instead hardcoded in Do_IsDevice
 begin
 begin
   FpIOCtl:=do_SysCall(syscall_nr_ioctl,handle,Ndx,TSysParam(data));
   FpIOCtl:=do_SysCall(syscall_nr_ioctl,handle,Ndx,TSysParam(data));

+ 1 - 0
rtl/darwin/ptypes.inc

@@ -33,6 +33,7 @@ type
     gid_t    = cuint32;         { used for group IDs           }
     gid_t    = cuint32;         { used for group IDs           }
     TGid     = gid_t;
     TGid     = gid_t;
     pGid     = ^gid_t;
     pGid     = ^gid_t;
+    TIOCtlRequest = cuLong;
 
 
     ino_t    = cuint32;         { used for file serial numbers }
     ino_t    = cuint32;         { used for file serial numbers }
     TIno     = ino_t;
     TIno     = ino_t;

+ 1 - 0
rtl/freebsd/ptypes.inc

@@ -31,6 +31,7 @@ type
     gid_t    = cuint32;         { used for group IDs           }
     gid_t    = cuint32;         { used for group IDs           }
     TGid     = gid_t;
     TGid     = gid_t;
     pGid     = ^gid_t;
     pGid     = ^gid_t;
+    TIOCtlRequest = cuLong;
 
 
     {$ifdef CPU64}
     {$ifdef CPU64}
      ino_t    = cuint32;           { used for file serial numbers }
      ino_t    = cuint32;           { used for file serial numbers }

+ 1 - 1
rtl/linux/ossysc.inc

@@ -510,7 +510,7 @@ end;
 // prototype is cint __P(cint,culong,....)
 // prototype is cint __P(cint,culong,....)
 // actual meaning of return value depends on request.
 // 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
 // This was missing here, instead hardcoded in Do_IsDevice
 begin
 begin
   FpIOCtl:=do_SysCall(syscall_nr_ioctl,tsysparam(fd),tsysparam(Request),TSysParam(data));
   FpIOCtl:=do_SysCall(syscall_nr_ioctl,tsysparam(fd),tsysparam(Request),TSysParam(data));

+ 2 - 0
rtl/linux/ptypes.inc

@@ -118,6 +118,8 @@ Type
     pUid     = ^uid_t;
     pUid     = ^uid_t;
     TGid     = gid_t;
     TGid     = gid_t;
     pGid     = ^gid_t;
     pGid     = ^gid_t;
+    
+    TIOCtlRequest = cInt;
 
 
 
 
     socklen_t= cuint32;
     socklen_t= cuint32;

+ 1 - 0
rtl/netbsd/ptypes.inc

@@ -31,6 +31,7 @@ type
     gid_t    = cuint32;         { used for group IDs           }
     gid_t    = cuint32;         { used for group IDs           }
     TGid     = gid_t;
     TGid     = gid_t;
     pGid     = ^gid_t;
     pGid     = ^gid_t;
+    TIOCtlRequest = cuLong;
 
 
     ino_t    = clong;           { used for file serial numbers }
     ino_t    = clong;           { used for file serial numbers }
     TIno     = ino_t;
     TIno     = ino_t;

+ 1 - 0
rtl/openbsd/ptypes.inc

@@ -31,6 +31,7 @@ type
     gid_t    = cuint32;         { used for group IDs           }
     gid_t    = cuint32;         { used for group IDs           }
     TGid     = gid_t;
     TGid     = gid_t;
     pGid     = ^gid_t;
     pGid     = ^gid_t;
+    TIOCtlRequest = cuLong;
 
 
     ino_t    = clong;           { used for file serial numbers }
     ino_t    = clong;           { used for file serial numbers }
     TIno     = ino_t;
     TIno     = ino_t;

+ 1 - 0
rtl/solaris/ptypes.inc

@@ -44,6 +44,7 @@ Type
     gid_t    = cuint32;         { used for group IDs           }
     gid_t    = cuint32;         { used for group IDs           }
     TGid     = gid_t;
     TGid     = gid_t;
     pGid     = ^gid_t;
     pGid     = ^gid_t;
+    TIOCtlRequest = cInt;
 
 
     ino_t    = clong;           { used for file serial numbers }
     ino_t    = clong;           { used for file serial numbers }
     TIno     = ino_t;
     TIno     = ino_t;

+ 1 - 0
rtl/unix/aliasptp.inc

@@ -23,6 +23,7 @@ type
     pDev     = UnixType.pDev;
     pDev     = UnixType.pDev;
     gid_t    = UnixType.gid_t;
     gid_t    = UnixType.gid_t;
     TGid     = UnixType.TGid;
     TGid     = UnixType.TGid;
+    TIOCtlRequest = UnixType.TIOCtlRequest;
     pGid     = UnixType.pGid;
     pGid     = UnixType.pGid;
     ino_t    = UnixType.ino_t;
     ino_t    = UnixType.ino_t;
     TIno     = UnixType.TIno;
     TIno     = UnixType.TIno;

+ 1 - 5
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  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  FPSigaction  (sig: cInt; act : pSigActionRec; oact : pSigActionRec): cint;  external name 'FPC_SYSC_SIGACTION';
     Function  FPSelect     (N:cint;readfds,writefds,exceptfds:pfdSet;TimeOut:PTimeVal):cint;
     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  FpNanoSleep  (req : ptimespec;rem : ptimespec):cint; external name 'FPC_SYSC_NANOSLEEP';
     Function  fpLstat(path:pchar;Info:pstat):cint;
     Function  fpLstat(path:pchar;Info:pstat):cint;
     Function  fpLstat(Filename: ansistring;Info:pstat):cint;
     Function  fpLstat(Filename: ansistring;Info:pstat):cint;

+ 1 - 5
rtl/unix/oscdeclh.inc

@@ -74,11 +74,7 @@ const
     procedure FpExit    (status : cint); cdecl; external clib name '_exit';
     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  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';
     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}
 {$ifdef beos}
     Function  FPSelect  (N:cint;readfds,writefds,exceptfds:pfdSet;TimeOut:PTimeVal):cint; cdecl; external 'net' name 'select';
     Function  FPSelect  (N:cint;readfds,writefds,exceptfds:pfdSet;TimeOut:PTimeVal):cint; cdecl; external 'net' name 'select';
 {$else}
 {$else}