Răsfoiți Sursa

+ cycling with 1.0.x fixed, hopefully the last fix of this for ever ;)

florian 20 ani în urmă
părinte
comite
207e67cc4d
2 a modificat fișierele cu 12 adăugiri și 2 ștergeri
  1. 6 1
      rtl/objpas/sysutils/dati.inc
  2. 6 1
      rtl/objpas/sysutils/datih.inc

+ 6 - 1
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);
           EncodeTime(Time shr 11, (Time shr 5) and 63, (Time and 31) shl 1,0);
 end;
 end;
 
 
+{$ifndef VER1_0}
 
 
 function TryStrToDate(const S: string; out Value: TDateTime): Boolean;
 function TryStrToDate(const S: string; out Value: TDateTime): Boolean;
   begin
   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;
 // function TryStrToDateTime(const S: string; out Value: TDateTime; const FormatSettings: TFormatSettings): Boolean;
 
 
+{$endif VER1_0}
 
 
 {
 {
   $Log$
   $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
     + TryStrToDate/Time functions
 
 
   Revision 1.9  2005/03/25 22:53:39  jonas
   Revision 1.9  2005/03/25 22:53:39  jonas

+ 6 - 1
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);
 procedure DateTimeToString(var Result: string; const FormatStr: string; const DateTime: TDateTime);
 Function DateTimeToFileDate(DateTime : TDateTime) : Longint;
 Function DateTimeToFileDate(DateTime : TDateTime) : Longint;
 Function FileDateToDateTime (Filedate : Longint) :TDateTime;
 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): Boolean;
 // function TryStrToDate(const S: string; out Value: TDateTime; const FormatSettings: TFormatSettings): 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): Boolean;
 // function TryStrToTime(const S: string; out Value: TDateTime; const FormatSettings: TFormatSettings): 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): Boolean;
 // function TryStrToDateTime(const S: string; out Value: TDateTime; const FormatSettings: TFormatSettings): Boolean;
 // function TryStrToDateTime(const S: string; out Value: TDateTime; const FormatSettings: TFormatSettings): Boolean;
+{$endif VER1_0}
 
 
 { FPC Extra }
 { FPC Extra }
 Procedure GetLocalTime(var SystemTime: TSystemTime);
 Procedure GetLocalTime(var SystemTime: TSystemTime);
 
 
 {
 {
   $Log$
   $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
     + TryStrToDate/Time functions
 
 
   Revision 1.4  2005/03/17 15:21:10  marco
   Revision 1.4  2005/03/17 15:21:10  marco