From d657b168c7e09c772ecafbb4818a0be2d40d148f Mon Sep 17 00:00:00 2001 From: marco Date: Tue, 30 Dec 2003 12:36:56 +0000 Subject: [PATCH] * FPC_USE_LIBC --- rtl/linux/baseunix.pp | 17 +++++++++++++++-- rtl/linux/system.pp | 10 +++++----- rtl/linux/unixsysc.inc | 8 ++++++-- 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/rtl/linux/baseunix.pp b/rtl/linux/baseunix.pp index 3e2a5ce785..fe518a37da 100644 --- a/rtl/linux/baseunix.pp +++ b/rtl/linux/baseunix.pp @@ -23,9 +23,19 @@ Interface {$define posixworkaround} // Temporary ugly workaround for signal handler. // (mainly until baseunix migration is complete) +{$ifndef FPC_USE_LIBC} +{$define FPC_USE_SYSCALL} +{$endif} + {$i errno.inc} { Error numbers } {$i bunxtype.inc} { Types } -{$i bunxh.inc} { Functions} +{$ifdef FPC_USE_LIBC} +{$i oscdeclh.inc} +{$ELSE} +{$i bunxh.inc} { Functions} +{$ENDIF} + +{$i bunxovlh.inc} function fpgeterrno:longint; procedure fpseterrno(err:longint); @@ -46,7 +56,10 @@ end. { $Log$ - Revision 1.5 2003-12-11 18:20:50 florian + Revision 1.6 2003-12-30 12:36:56 marco + * FPC_USE_LIBC + + Revision 1.5 2003/12/11 18:20:50 florian * replaced VER1_0 by HASGLOBALPROPERTY Revision 1.4 2003/12/10 17:14:06 marco diff --git a/rtl/linux/system.pp b/rtl/linux/system.pp index dc25028669..650b9dff49 100644 --- a/rtl/linux/system.pp +++ b/rtl/linux/system.pp @@ -22,16 +22,13 @@ { If you use an aout system, set the conditional AOUT} { $Define AOUT} -{$ifdef BSD} -Unit {$ifdef VER1_0}SysBSD{$else}System{$endif}; -{$else} Unit {$ifdef VER1_0}Syslinux{$else}System{$endif}; -{$endif} Interface {$define oldreaddir} {$define usedomain} {$define posixworkaround} +{$define FPC_IS_SYSTEM} {$I sysunixh.inc} @@ -136,7 +133,10 @@ End. { $Log$ - Revision 1.8 2003-09-14 20:15:01 marco + Revision 1.9 2003-12-30 12:36:56 marco + * FPC_USE_LIBC + + Revision 1.8 2003/09/14 20:15:01 marco * Unix reform stage two. Remove all calls from Unix that exist in Baseunix. Revision 1.7 2003/04/30 22:11:06 florian diff --git a/rtl/linux/unixsysc.inc b/rtl/linux/unixsysc.inc index 8664f9a51b..4d1a8ed2dc 100644 --- a/rtl/linux/unixsysc.inc +++ b/rtl/linux/unixsysc.inc @@ -24,6 +24,7 @@ begin flock:=do_Syscall(Syscall_nr_flock,fd,mode); end; +{ Function StatFS(Path:Pathstr;Var Info:tstatfs):cint; { Get all information on a fileSystem, and return it in Info. @@ -34,7 +35,7 @@ begin path:=path+#0; StatFS:=(do_SysCall(SysCall_nr_statfs,longint(@path[1]),longint(@Info))); end; - +} Function fStatFS(Fd:cint;Var Info:tstatfs):cint; { Get all information on a fileSystem, and return it in Info. @@ -110,7 +111,10 @@ end; { $Log$ - Revision 1.21 2003-11-19 11:46:55 marco + Revision 1.22 2003-12-30 12:36:56 marco + * FPC_USE_LIBC + + Revision 1.21 2003/11/19 11:46:55 marco * changes due to the previous *BSD changes. Mainly moving constants from unix to systypes.inc (which acts as unxtypes.inc)