paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-07-31 18:05:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

* fixes StrToTime() thanks to jesus

Browse Source 
git-svn-id: trunk@5100 -
This commit is contained in:
Almindor 2006-10-30 22:52:56 +00:00
parent ef7bd58c54
commit 0c6e1e4c44
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rtl/objpas/sysutils/dati.inc
View File

@ -476,7 +476,7 @@ while (i < 5) and (TimeValues[i] <> -1) do begin
end ;
If (i<5) and (TimeValues[I]=-1) then
TimeValues[I]:=0;
if PM then Inc(TimeValues[0], 12);
if PM and (TimeValues[0] <> 12) then Inc(TimeValues[0], 12);
result := EncodeTime(TimeValues[0], TimeValues[1], TimeValues[2], TimeValues[3]);
end ;
@ -836,4 +836,4 @@ procedure ReplaceTime(var dati:TDateTime; NewTime : TDateTime);
begin
dati:=trunc(dati)+frac(newtime);
end;
end;