Merged with delphi 2010 branch

[lcore.git] / lcorernd.pas

diff --git a/lcorernd.pas b/lcorernd.pas
index 673860fed0eb25d52205e6500f21523828b525c5..3e43bb124b2d6f1dd22869f2940b619c3bd27210 100644 (file)
--- a/lcorernd.pas
+++ b/lcorernd.pas
@@ -111,7 +111,7 @@ function randominteger(i:longint):longint;
 function randombits(b:integer):longint;\r
 \r
 {generate a version 4 random uuid}\r
 function randombits(b:integer):longint;\r
 \r
 {generate a version 4 random uuid}\r

-function generate_uuid:string;\r
+function generate_uuid:ansistring;\r

 \r
 {$ifndef nolcorernd}\r
 \r
 \r
 {$ifndef nolcorernd}\r
 \r


@@ -402,12 +402,12 @@ begin
 end;\r
 \r
 const\r
 end;\r
 \r
 const\r

-  ch:array[0..15] of char='0123456789abcdef';\r
+  ch:array[0..15] of ansichar='0123456789abcdef';\r

 \r
 \r

-function generate_uuid:string;\r
+function generate_uuid:ansistring;\r

 var\r
   buf:array[0..7] of word;\r
 var\r
   buf:array[0..7] of word;\r

-function inttohex(w:word):string;\r
+function inttohex(w:word):ansistring;\r

 begin\r
   result := ch[w shr 12] + ch[(w shr 8) and $f] + ch[(w shr 4) and $f] + ch[w and $f];\r
 end;\r
 begin\r
   result := ch[w shr 12] + ch[(w shr 8) and $f] + ch[(w shr 4) and $f] + ch[w and $f];\r
 end;\r