ifdef mswindows instead of win32 for 64 bits support

[lcore.git] / lcorelocalips.pas

diff --git a/lcorelocalips.pas b/lcorelocalips.pas
index dcc633a1a9a89ff8f2e6fedc38e5543bdae9f362..d2750129f343906eee9231f4082c5a9c965f2e6f 100644 (file)
--- a/lcorelocalips.pas
+++ b/lcorelocalips.pas
@@ -51,7 +51,7 @@ function getv6localips:tbiniplist;
 \r
 function getsystemdnsservers:tbiniplist;\r
 \r
-{$ifdef win32}\r
+{$ifdef mswindows}\r
 function gethostname:ansistring;\r
 {$endif}\r
 \r
@@ -188,7 +188,7 @@ end;
 {$else}\r
 \r
 uses\r
-  sysutils,windows,winsock,dnssync,dnscore;\r
+  sysutils,windows,winsock,dnswin;\r
 \r
 {the following code's purpose is to determine what IP windows would come from, to reach an IP\r
 it can be abused to find if there's any global v6 IPs on a local interface}\r
@@ -256,13 +256,9 @@ var
   a:integer;\r
   ip:tbinip;\r
   usewindnstemp:boolean;\r
+  error:integer;\r
 begin\r
-  {this lookup must always be done with the windows API lookup\r
-  setting usewindns to false on windows will fail with infinite recursion}\r
-  usewindnstemp := usewindns;\r
-  usewindns := true;\r
-  result := forwardlookuplist('',0);\r
-  usewindns := usewindnstemp;\r
+  result := winforwardlookuplist('',0,error);\r
 \r
   {$ifdef ipv6}\r
 \r
@@ -288,7 +284,7 @@ end;
 \r
 \r
 \r
-{$ifdef win32}\r
+{$ifdef mswindows}\r
   const\r
     MAX_HOSTNAME_LEN = 132;\r
     MAX_DOMAIN_NAME_LEN = 132;\r
@@ -354,7 +350,7 @@ end;
 \r
 function getsystemdnsservers:tbiniplist;\r
 var\r
-  {$ifdef win32}\r
+  {$ifdef mswindows}\r
     fixed_info : pfixed_info;\r
     currentdnsserver : pip_addr_string;\r
   {$else}\r
@@ -368,7 +364,7 @@ begin
 \r
   result := biniplist_new;\r
 \r
-  {$ifdef win32}\r
+  {$ifdef mswindows}\r
     fixed_info := callgetnetworkparams;\r
     if fixed_info = nil then exit;\r
 \r
@@ -404,7 +400,7 @@ begin
   {$endif}\r
 end;\r
 \r
-{$ifdef win32}\r
+{$ifdef mswindows}\r
 function gethostname:ansistring;\r
 var\r
     fixed_info : pfixed_info;\r