Browse Source

* Fixes to the FreeBSD compability of the datetime patches

marco 24 years ago
parent
commit
8c8e53ffa0
3 changed files with 20 additions and 6 deletions
  1. 6 3
      rtl/unix/dos.pp
  2. 8 2
      rtl/unix/linux.pp
  3. 6 1
      rtl/unix/unix.pp

+ 6 - 3
rtl/unix/dos.pp

@@ -258,7 +258,7 @@ end;
 
 Procedure SetDate(Year, Month, Day: Word);
 Begin
-  Linux.SetDate ( Year, Month, Day );
+  Unix.SetDate ( Year, Month, Day ); 
 End;
 
 
@@ -272,7 +272,7 @@ end;
 
 Procedure SetTime(Hour, Minute, Second, Sec100: Word);
 Begin
-  Linux.SetTime ( Hour, Minute, Second );
+  Unix.SetTime ( Hour, Minute, Second );
 End;
 
 
@@ -877,7 +877,10 @@ End.
 
 {
   $Log$
-  Revision 1.7  2001-07-12 07:20:05  michael
+  Revision 1.8  2001-07-12 12:42:39  marco
+   * Fixes to the FreeBSD compability of the datetime patches
+
+  Revision 1.7  2001/07/12 07:20:05  michael
   + Added setdate/time/datetime functions
 
   Revision 1.6  2001/06/03 20:19:09  peter

+ 8 - 2
rtl/unix/linux.pp

@@ -874,7 +874,8 @@ Begin
   EpochToLocal(GetTimeOfDay,year,month,day,hour,minute,second);
 End;
 
-{$ifdef linux}
+{$ifndef BSD}     {Start 1.0.x compiler FreeBSD cycle defines linux}
+{$ifdef Linux}
 Function stime (t : longint) : Boolean;
 var
   sr : Syscallregs;
@@ -885,10 +886,12 @@ begin
    stime:=linuxerror=0;
 end;
 {$endif}
+{$endif}
 
 {$ifdef BSD}
 Function stime (t : longint) : Boolean;
 begin
+  
 end;
 {$endif}
 
@@ -2936,7 +2939,10 @@ End.
 
 {
   $Log$
-  Revision 1.12  2001-07-12 07:20:05  michael
+  Revision 1.13  2001-07-12 12:42:39  marco
+   * Fixes to the FreeBSD compability of the datetime patches
+
+  Revision 1.12  2001/07/12 07:20:05  michael
   + Added setdate/time/datetime functions
 
   Revision 1.11  2001/07/10 18:04:37  peter

+ 6 - 1
rtl/unix/unix.pp

@@ -875,6 +875,7 @@ Begin
   EpochToLocal(GetTimeOfDay,year,month,day,hour,minute,second);
 End;
 
+{$ifndef BSD}
 {$ifdef linux}
 Function stime (t : longint) : Boolean;
 var
@@ -886,6 +887,7 @@ begin
    stime:=linuxerror=0;
 end;
 {$endif}
+{$endif}
 
 {$ifdef BSD}
 Function stime (t : longint) : Boolean;
@@ -2931,7 +2933,10 @@ End.
 
 {
   $Log$
-  Revision 1.13  2001-07-12 07:20:05  michael
+  Revision 1.14  2001-07-12 12:42:39  marco
+   * Fixes to the FreeBSD compability of the datetime patches
+
+  Revision 1.13  2001/07/12 07:20:05  michael
   + Added setdate/time/datetime functions
 
   Revision 1.12  2001/06/20 15:24:47  marco