X-Git-Url: http://www.lcore.org/git/lcore.git/blobdiff_plain/2dd575b95694c126013c912526093ff4915f3398..refs/heads/delphi2010:/lcorernd.pas diff --git a/lcorernd.pas b/lcorernd.pas index 643de3a..3e43bb1 100644 --- a/lcorernd.pas +++ b/lcorernd.pas @@ -111,7 +111,7 @@ function randominteger(i:longint):longint; function randombits(b:integer):longint; {generate a version 4 random uuid} -function generate_uuid:string; +function generate_uuid:ansistring; {$ifndef nolcorernd} @@ -133,7 +133,13 @@ implementation {$ifndef nolcorernd} uses {$ifdef win32}windows,activex,{$endif} - {$ifdef unix}baseunix,unix,unixutil,{$endif} + {$ifdef unix} + {$ifdef ver1_0} + linux, + {$else} + baseunix,unix,unixutil,sockets, + {$endif} + {$endif} fastmd5,sysutils; {$ifdef unix}{$include unixstuff.inc}{$endif} @@ -396,12 +402,12 @@ begin end; const - ch:array[0..15] of char='0123456789abcdef'; + ch:array[0..15] of ansichar='0123456789abcdef'; -function generate_uuid:string; +function generate_uuid:ansistring; var buf:array[0..7] of word; -function inttohex(w:word):string; +function inttohex(w:word):ansistring; begin result := ch[w shr 12] + ch[(w shr 8) and $f] + ch[(w shr 4) and $f] + ch[w and $f]; end;