paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2026-01-06 10:50:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

+ ReplaceDate

Browse Source 
git-svn-id: trunk@7794 -
This commit is contained in:
florian 2007-06-24 15:15:53 +00:00
parent d50f869bbd
commit 628452f04d
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -483,14 +483,14 @@ If (i<5) and (TimeValues[I]=-1) then
TimeValues[I]:=0;
if PM then
begin
if (TimeValues[0] <> 12) then
if (TimeValues[0] <> 12) then
Inc(TimeValues[0], 12);
end
else
begin
if (TimeValues[0]=12) then
TimeValues[0]:=0;
end;
end;
result := EncodeTime(TimeValues[0], TimeValues[1], TimeValues[2], TimeValues[3]);
end ;
@ -847,7 +847,16 @@ begin
end;
procedure ReplaceTime(var dati:TDateTime; NewTime : TDateTime);inline;
begin
dati:=trunc(dati)+frac(newtime);
end;
procedure ReplaceDate(var DateTime: TDateTime; const NewDate: TDateTime); inline;
var
tmp : TDateTime;
begin
tmp:=NewDate;
ReplaceTime(tmp,DateTime);
DateTime:=tmp;
end;

3
rtl/objpas/sysutils/datih.inc
View File

@ -140,4 +140,5 @@ function CurrentYear:Word;
{ FPC Extra }
Procedure GetLocalTime(var SystemTime: TSystemTime);
procedure ReplaceTime(var dati:TDateTime; NewTime : TDateTime); inline;
procedure ReplaceTime(var dati:TDateTime; NewTime : TDateTime); inline;
procedure ReplaceDate(var DateTime: TDateTime; const NewDate: TDateTime); inline;