* add typecasts for oldlinuxstat

This commit is contained in:
peter 2003-09-16 16:06:02 +00:00
parent cabc606aab
commit 7acb66b1a3
3 changed files with 22 additions and 12 deletions

View File

@ -5,10 +5,10 @@
BSD parts (c) 2000 by Marco van de Voort
members of the Free Pascal development team.
The old 1.0.x linux unit fixed to work under 1.1.x.
The old 1.0.x linux unit fixed to work under 1.1.x.
At the moment the errorhandling can be different.
Probably it won't be supported for anything else then FreeBSD
and Linux/i386.
and Linux/i386.
See the file COPYING.FPC, included in this distribution,
for details about the copyright.
@ -44,12 +44,13 @@ Uses BaseUnix,Unix;
{$I signal.inc}
{$ifdef linux}
{$IFNDEF VER1_0} // ugly voodoo. Sacrifice a chicken and hope
// that it works.
{$IFNDEF VER1_0} // ugly voodoo. Sacrifice a chicken and hope
// that it works.
Type stat=baseunix.tstat;
{$ELSE}
type
{$I stat.inc}
{$define oldlinuxstat}
{$ENDIF}
{$ELSE}
Type stat=baseunix.tstat;
@ -1081,7 +1082,7 @@ end;
Function Sys_Stat(Filename:pchar;var Buffer: stat):longint;
begin
Sys_stat:=fpstat(filename,buffer);
Sys_stat:=fpstat(filename,{$ifdef oldlinuxstat}baseunix.stat(buffer){$else}buffer{$endif});
linuxerror:=fpgeterrno;
end;
@ -1509,7 +1510,7 @@ begin
fpseterrno(ESysEBadf);
exit;
end;
{$ifndef bsd}
{$ifndef bsd}
{$ifndef Solaris}
p^.dd_nextoff:=Sys_lseek(p^.dd_fd,off,seek_set);
{$endif}
@ -3130,7 +3131,10 @@ finalization
end.
{
$Log$
Revision 1.5 2003-09-16 15:40:31 marco
Revision 1.6 2003-09-16 16:06:02 peter
* add typecasts for oldlinuxstat
Revision 1.5 2003/09/16 15:40:31 marco
* voodoo is now linux only
Revision 1.4 2003/09/16 15:39:31 marco

View File

@ -313,7 +313,7 @@ Function Fstat(Fd:Longint;var Info:stat):Boolean;
Get all information on a file descriptor, and return it in info.
}
begin
FStat:=fpfstat(fd,info)=0;
FStat:=fpfstat(fd,{$ifdef oldlinuxstat}baseunix.stat(info){$else}info{$endif})=0;
LinuxError:=fpgetErrno;
end;
@ -636,7 +636,10 @@ end;
{
$Log$
Revision 1.2 2003-09-15 21:07:41 marco
Revision 1.3 2003-09-16 16:06:02 peter
* add typecasts for oldlinuxstat
Revision 1.2 2003/09/15 21:07:41 marco
* second round of linux fixes. oldlinux now works
Revision 1.1 2003/09/15 20:30:49 marco

View File

@ -252,10 +252,10 @@ begin
GetTimezoneFile:=s;
end
// Try SuSE
else if fpstat(TimeZoneFile,info)>=0 then
else if fpstat(TimeZoneFile,{$ifdef oldlinuxstat}baseunix.stat(info){$else}info{$endif})>=0 then
GetTimeZoneFile:=TimeZoneFile
// Try RedHat
else If fpstat(AltTimeZoneFile,Info)>=0 then
else If fpstat(AltTimeZoneFile,{$ifdef oldlinuxstat}baseunix.stat(info){$else}info{$endif})>=0 then
GetTimeZoneFile:=AltTimeZoneFile;
end;
@ -286,7 +286,10 @@ end;
{
$Log$
Revision 1.4 2003-09-14 20:15:01 marco
Revision 1.5 2003-09-16 16:06:02 peter
* add typecasts for oldlinuxstat
Revision 1.4 2003/09/14 20:15:01 marco
* Unix reform stage two. Remove all calls from Unix that exist in Baseunix.
Revision 1.3 2002/09/07 16:01:28 peter