Type fix for binipstuff and revert btime

[lcore.git] / btime.pas

diff --git a/btime.pas b/btime.pas
index ea199c615081be7da36ae3e9278d64f81016247b..9bb95502b13300569be20b37194f402ab646334b 100644 (file)
--- a/btime.pas
+++ b/btime.pas
@@ -20,7 +20,7 @@ const
 \r
 var\r
   timezone:integer;\r
-  timezonestr:ansistring;\r
+  timezonestr:string;\r
   irctime,unixtime:integer;\r
   tickcount:integer;\r
   settimebias:integer;\r
@@ -39,8 +39,8 @@ procedure gettimezone;
 procedure timehandler;\r
 procedure init;\r
 \r
-function timestring(i:integer):ansistring;\r
-function timestrshort(i:integer):ansistring;\r
+function timestring(i:integer):string;\r
+function timestrshort(i:integer):string;\r
 \r
 {$ifdef win32}\r
 function unixtimefloat_systemtime:float;\r
@@ -543,13 +543,13 @@ begin
 \r
   if timezone >= 0 then timezonestr := '+' else timezonestr := '-';\r
   l := abs(timezone) div 60;\r
-  timezonestr := timezonestr + ansichar(l div 600 mod 10+48)+ansichar(l div 60 mod 10+48)+':'+ansichar(l div 10 mod 6+48)+ansichar(l mod 10+48);\r
+  timezonestr := timezonestr + char(l div 600 mod 10+48)+char(l div 60 mod 10+48)+':'+char(l div 10 mod 6+48)+char(l mod 10+48);\r
 end;\r
 \r
-function timestrshort(i:integer):ansistring;\r
+function timestrshort(i:integer):string;\r
 const\r
-  weekday:array[0..6] of ansistring =('Thu','Fri','Sat','Sun','Mon','Tue','Wed');\r
-  month:array[0..11] of ansistring =('Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec');\r
+  weekday:array[0..6] of string[4]=('Thu','Fri','Sat','Sun','Mon','Tue','Wed');\r
+  month:array[0..11] of string[4]=('Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec');\r
 var\r
   y,m,d,h,min,sec,ms:word;\r
   t:tdatetime;\r
@@ -562,10 +562,10 @@ begin
   inttostr(y);\r
 end;\r
 \r
-function timestring(i:integer):ansistring;\r
+function timestring(i:integer):string;\r
 const\r
-  weekday:array[0..6] of ansistring =('Thursday','Friday','Saturday','Sunday','Monday','Tuesday','Wednesday');\r
-  month:array[0..11] of ansistring =('January','February','March','April','May','June','July','August','September','October','November','December');\r
+  weekday:array[0..6] of string[10]=('Thursday','Friday','Saturday','Sunday','Monday','Tuesday','Wednesday');\r
+  month:array[0..11] of string[10]=('January','February','March','April','May','June','July','August','September','October','November','December');\r
 var\r
   y,m,d,h,min,sec,ms:word;\r
   t:tdatetime;\r