Bläddra i källkod

* revert r47532, r47527 (use timezone information from fpgettimeofday) because they are not available on all Linux distributions

git-svn-id: trunk@47541 -
ondrej 4 år sedan
förälder
incheckning
63beb1e83a
2 ändrade filer med 18 tillägg och 27 borttagningar
  1. 7 11
      rtl/unix/dos.pp
  2. 11 16
      rtl/unix/sysutils.pp

+ 7 - 11
rtl/unix/dos.pp

@@ -144,13 +144,11 @@ end;
 
 Procedure GetDate(Var Year, Month, MDay, WDay: Word);
 var
-  tv:timeval;
-  tz:timezone;
+  tz:timeval;
   hour,min,sec : word;
 begin
-  fpgettimeofday(@tv,@tz);
-  tv.tv_sec:=tv.tv_sec-tz.tz_minuteswest*60;
-  EpochToUniversal(tv.tv_sec,year,month,mday,hour,min,sec);
+  fpgettimeofday(@tz,nil);
+  EpochToLocal(tz.tv_sec,year,month,mday,hour,min,sec);
   Wday:=weekday(Year,Month,MDay);
 end;
 
@@ -191,14 +189,12 @@ end;
 
 Procedure GetTime(Var Hour, Minute, Second, Sec100: Word);
 var
-  tv:timeval;
-  tz:timezone;
+  tz:timeval;
   year,month,day : word;
 begin
-  fpgettimeofday(@tv,@tz);
-  tv.tv_sec:=tv.tv_sec-tz.tz_minuteswest*60;
-  EpochToUniversal(tv.tv_sec,year,month,day,hour,minute,second);
-  sec100:=tv.tv_usec div 10000;
+  fpgettimeofday(@tz,nil);
+  EpochToLocal(tz.tv_sec,year,month,day,hour,minute,second);
+  sec100:=tz.tv_usec div 10000;
 end;
 
 

+ 11 - 16
rtl/unix/sysutils.pp

@@ -1191,12 +1191,12 @@ end;
 Procedure DoGetUniversalDateTime(var year, month, day, hour, min,  sec, msec, usec : word);
 
 var
-  tp:timeval;
+  tz:timeval;
 begin
-  fpgettimeofday(@tp,nil);
-  EpochToUniversal(tp.tv_sec,year,month,day,hour,min,sec);
-  msec:=tp.tv_usec div 1000;
-  usec:=tp.tv_usec mod 1000;
+  fpgettimeofday(@tz,nil);
+  EpochToUniversal(tz.tv_sec,year,month,day,hour,min,sec);
+  msec:=tz.tv_usec div 1000;
+  usec:=tz.tv_usec mod 1000;
 end;
 
 // Now, adjusted to local time.
@@ -1204,14 +1204,12 @@ end;
 Procedure DoGetLocalDateTime(var year, month, day, hour, min,  sec, msec, usec : word);
 
 var
-  tv:timeval;
-  tz:timezone;
+  tz:timeval;
 begin
-  fpgettimeofday(@tv,@tz);
-  tv.tv_sec:=tv.tv_sec-tz.tz_minuteswest*60;
-  EpochToUniversal(tv.tv_sec,year,month,day,hour,min,sec);
-  msec:=tv.tv_usec div 1000;
-  usec:=tv.tv_usec mod 1000;
+  fpgettimeofday(@tz,nil);
+  EpochToLocal(tz.tv_sec,year,month,day,hour,min,sec);
+  msec:=tz.tv_usec div 1000;
+  usec:=tz.tv_usec mod 1000;
 end;
 
 procedure GetTime(var hour,min,sec,msec,usec:word);
@@ -1649,11 +1647,8 @@ end;
 
 function GetLocalTimeOffset: Integer;
 
-var
-  tz:timezone;
 begin
-  fpgettimeofday(nil,@tz);
-  GetLocalTimeOffset:=tz.tz_minuteswest;
+ Result := -Tzseconds div 60; 
 end;
 
 function GetLocalTimeOffset(const DateTime: TDateTime; const InputIsUTC: Boolean; out Offset: Integer): Boolean;