From 207e67cc4d898c1676aa932f577afc095667e265 Mon Sep 17 00:00:00 2001 From: florian Date: Sun, 8 May 2005 08:03:15 +0000 Subject: [PATCH] + cycling with 1.0.x fixed, hopefully the last fix of this for ever ;) --- rtl/objpas/sysutils/dati.inc | 7 ++++++- rtl/objpas/sysutils/datih.inc | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/rtl/objpas/sysutils/dati.inc b/rtl/objpas/sysutils/dati.inc index 3ee78fac74..dad7ec8d12 100644 --- a/rtl/objpas/sysutils/dati.inc +++ b/rtl/objpas/sysutils/dati.inc @@ -753,6 +753,7 @@ begin EncodeTime(Time shr 11, (Time shr 5) and 63, (Time and 31) shl 1,0); end; +{$ifndef VER1_0} function TryStrToDate(const S: string; out Value: TDateTime): Boolean; begin @@ -798,10 +799,14 @@ function TryStrToDateTime(const S: string; out Value: TDateTime): Boolean; // function TryStrToDateTime(const S: string; out Value: TDateTime; const FormatSettings: TFormatSettings): Boolean; +{$endif VER1_0} { $Log$ - Revision 1.10 2005-05-07 10:23:17 florian + Revision 1.11 2005-05-08 08:03:15 florian + + cycling with 1.0.x fixed, hopefully the last fix of this for ever ;) + + Revision 1.10 2005/05/07 10:23:17 florian + TryStrToDate/Time functions Revision 1.9 2005/03/25 22:53:39 jonas diff --git a/rtl/objpas/sysutils/datih.inc b/rtl/objpas/sysutils/datih.inc index 18ce8880a6..79a4757af3 100644 --- a/rtl/objpas/sysutils/datih.inc +++ b/rtl/objpas/sysutils/datih.inc @@ -122,19 +122,24 @@ function FormatDateTime(FormatStr: string; DateTime: TDateTime):string; procedure DateTimeToString(var Result: string; const FormatStr: string; const DateTime: TDateTime); Function DateTimeToFileDate(DateTime : TDateTime) : Longint; Function FileDateToDateTime (Filedate : Longint) :TDateTime; +{$ifndef VER1_0} function TryStrToDate(const S: string; out Value: TDateTime): Boolean; // function TryStrToDate(const S: string; out Value: TDateTime; const FormatSettings: TFormatSettings): Boolean; 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; +{$endif VER1_0} { FPC Extra } Procedure GetLocalTime(var SystemTime: TSystemTime); { $Log$ - Revision 1.5 2005-05-07 10:23:17 florian + Revision 1.6 2005-05-08 08:03:15 florian + + cycling with 1.0.x fixed, hopefully the last fix of this for ever ;) + + Revision 1.5 2005/05/07 10:23:17 florian + TryStrToDate/Time functions Revision 1.4 2005/03/17 15:21:10 marco