--- Merging r23337 into '.':

U    rtl/objpas/sysutils/dati.inc

# revisions: 23337
r23337 | michael | 2013-01-07 14:00:27 +0100 (Mon, 07 Jan 2013) | 1 line
Changed paths:
   M /trunk/rtl/objpas/sysutils/dati.inc

* Changed DateTimeToTimestamp not to use Round()

git-svn-id: branches/fixes_2_6@24270 -

rtl/objpas/sysutils/dati.inc

@@ -55,11 +55,14 @@ function DateTimeToTimeStamp(DateTime: TDateTime): TTimeStamp;
 
 Var
   D : Double;
-
 begin
   D:=DateTime * Single(MSecsPerDay);
-  result.Time := Abs(Round(D)) Mod MSecsPerDay;
-  result.Date := DateDelta + Round(D) div MSecsPerDay;
+  if D<0 then
+    D:=D-0.5
+  else
+    D:=D+0.5;
+  result.Time := Abs(Trunc(D)) Mod MSecsPerDay;
+  result.Date := DateDelta + Trunc(D) div MSecsPerDay;
 end;
 
 {   TimeStampToDateTime converts TimeStamp to a TDateTime value   }