ifdef mswindows instead of win32 for 64 bits support

[lcore.git] / lcorernd.pas

diff --git a/lcorernd.pas b/lcorernd.pas
index 64759e83fc95d67508cae7ac4256d587cc9f4100..648c87aa67cbb357ab4cd7d19c479dda6caa6d7d 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


@@ -132,12 +132,12 @@ implementation
 \r
 {$ifndef nolcorernd}\r
 uses\r
 \r
 {$ifndef nolcorernd}\r
 uses\r

-  {$ifdef win32}windows,activex,{$endif}\r
+  {$ifdef mswindows}windows,activex,{$endif}\r

   {$ifdef unix}\r
     {$ifdef ver1_0}\r
       linux,\r
     {$else}\r
   {$ifdef unix}\r
     {$ifdef ver1_0}\r
       linux,\r
     {$else}\r

-      baseunix,unix,unixutil,\r
+      baseunix,unix,unixutil,sockets,\r

     {$endif}\r
   {$endif}\r
   fastmd5,sysutils;\r
     {$endif}\r
   {$endif}\r
   fastmd5,sysutils;\r


@@ -165,7 +165,7 @@ var
   pool:array[0..(pooldwords+seeddwords-1)] of wordtype;\r
   reseedcountdown:integer;\r
 \r
   pool:array[0..(pooldwords+seeddwords-1)] of wordtype;\r
   reseedcountdown:integer;\r
 \r

-{$ifdef win32}\r
+{$ifdef mswindows}\r

 function collect_seeding(var output;const bufsize:integer):integer;\r
 var\r
   l:packed record\r
 function collect_seeding(var output;const bufsize:integer):integer;\r
 var\r
   l:packed record\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