Merged revisions 3031 via svnmerge from

svn+ssh://[email protected]/FPC/svn/fpc/trunk

........
r3031 | marco | 2006-03-25 16:07:54 +0100 (Sat, 25 Mar 2006) | 2 lines

 * currentyear (bug 4904)

........

git-svn-id: branches/fixes_2_0@3032 -

rtl/objpas/sysutils/dati.inc

@@ -730,6 +730,12 @@ begin
 {$endif unix}
 end;
 
+function CurrentYear:Word;
+var yy,mm,dd : word;
+begin
+  Decodedate(now,yy,mm,dd);
+  Result:=yy;
+end;
 
 Function FileDateToDateTime (Filedate : Longint) : TDateTime;
 

rtl/objpas/sysutils/datih.inc

@@ -127,7 +127,7 @@ function TryStrToTime(const S: string; out Value: TDateTime): Boolean;
 // function TryStrToTime(const S: string; out Value: TDateTime; const FormatSettings: TFormatSettings): Boolean;
 function TryStrToDateTime(const S: string; out Value: TDateTime): Boolean;
 // function TryStrToDateTime(const S: string; out Value: TDateTime; const FormatSettings: TFormatSettings): Boolean;
-
+function CurrentYear:Word;
 { FPC Extra }
 Procedure GetLocalTime(var SystemTime: TSystemTime);