More string type fixes

[lcore.git] / btime.pas

diff --git a/btime.pas b/btime.pas
old mode 100755 (executable)
new mode 100644 (file)
index 4636a9b..de279df
--- a/btime.pas
+++ b/btime.pas
@@ -20,7 +20,7 @@ const
 \r
 var\r
   timezone:integer;\r
 \r
 var\r
   timezone:integer;\r

-  timezonestr:string;\r
+  timezonestr:ansistring;\r

   irctime,unixtime:integer;\r
   tickcount:integer;\r
   settimebias:integer;\r
   irctime,unixtime:integer;\r
   tickcount:integer;\r
   settimebias:integer;\r


@@ -39,8 +39,8 @@ procedure gettimezone;
 procedure timehandler;\r
 procedure init;\r
 \r
 procedure timehandler;\r
 procedure init;\r
 \r

-function timestring(i:integer):string;\r
-function timestrshort(i:integer):string;\r
+function timestring(i:integer):ansistring;\r
+function timestrshort(i:integer):ansistring;\r

 \r
 {$ifdef win32}\r
 function unixtimefloat_systemtime:float;\r
 \r
 {$ifdef win32}\r
 function unixtimefloat_systemtime:float;\r


@@ -96,7 +96,7 @@ uses
     {$ifdef VER1_0}\r
       linux,\r
     {$else}\r
     {$ifdef VER1_0}\r
       linux,\r
     {$else}\r

-      baseunix,unix,unixutil, {needed for 2.0.2}\r
+      baseunix,unix,unixutil,sockets, {unixutil and sockets needed by unixstuff.inc on some compiler versions}\r

     {$endif}\r
   {$else}\r
     windows,unitsettc,mmsystem,\r
     {$endif}\r
   {$else}\r
     windows,unitsettc,mmsystem,\r


@@ -546,10 +546,10 @@ begin
   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
   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):string;\r
+function timestrshort(i:integer):ansistring;\r

 const\r
 const\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
+  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

 var\r
   y,m,d,h,min,sec,ms:word;\r
   t:tdatetime;\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
   inttostr(y);\r
 end;\r
 \r

-function timestring(i:integer):string;\r
+function timestring(i:integer):ansistring;\r

 const\r
 const\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
+  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

 var\r
   y,m,d,h,min,sec,ms:word;\r
   t:tdatetime;\r
 var\r
   y,m,d,h,min,sec,ms:word;\r
   t:tdatetime;\r