* PChar -> PAnsiChar

packages/fcl-net/src/amiga/resolve.inc

@@ -36,38 +36,38 @@ Type
 
   { THostEnt Object }
   THostEnt = record
-    H_Name     : pchar;   { Official name }
-    H_Aliases  : ppchar;  { Null-terminated list of aliases}
+    H_Name     : PAnsiChar;   { Official name }
+    H_Aliases  : PPAnsiChar;  { Null-terminated list of aliases}
     H_Addrtype : longint;   { Host address type }
     H_length  : longint;   { Length of address }
-    H_Addr : ppchar;    { null-terminated list of adresses }
+    H_Addr : PPAnsiChar;    { null-terminated list of adresses }
   end;
   PHostEntry = ^THostEnt;
 
   { TNetEnt object }
   TNetEnt = record
-    N_Name     : pchar;   { Official name }
-    N_Aliases  : ppchar;  { Nill-terminated alias list }
+    N_Name     : PAnsiChar;   { Official name }
+    N_Aliases  : PPAnsiChar;  { Nill-terminated alias list }
     N_AddrType : longint; { Net address type }
     N_net      : Cardinal; { Network number }
   end;
   PNetEntry = ^TNetEnt;
 
   TServEnt = record
-    s_name    : pchar;    { Service name }
-    s_aliases : ppchar;   { Null-terminated alias list }
+    s_name    : PAnsiChar;    { Service name }
+    s_aliases : PPAnsiChar;   { Null-terminated alias list }
     s_port    : longint;  { Port number }
-    s_proto   : pchar;    { Protocol to use }
+    s_proto   : PAnsiChar;    { Protocol to use }
   end;
   PServEntry = ^TServEnt;
 
 { remember, classic style calls are also used on MorphOS, so don't test for AMIGA68K }
 {$ifndef AMIGAOS4}
-function fpgethostbyname(Name: PChar location 'a0'): PHostEntry; syscall SocketBase 210;
-function getnetbyname(Name: PChar location 'a0'): PNetEntry; syscall SocketBase 222;
+function fpgethostbyname(Name: PAnsiChar location 'a0'): PHostEntry; syscall SocketBase 210;
+function getnetbyname(Name: PAnsiChar location 'a0'): PNetEntry; syscall SocketBase 222;
 function getnetbyaddr(Net: Longint location 'd0'; NetType: Longint location 'd1'): PNetEntry; syscall SocketBase 228;
-function getservbyname(Name: PChar location 'a0'; Protocol: PChar location 'a1'): PServEntry; syscall SocketBase 234;
-function getservbyport(Port: LongInt location 'd0'; Protocol: PChar location 'a0'): PServEntry; syscall SocketBase 240;
+function getservbyname(Name: PAnsiChar location 'a0'; Protocol: PAnsiChar location 'a1'): PServEntry; syscall SocketBase 234;
+function getservbyport(Port: LongInt location 'd0'; Protocol: PAnsiChar location 'a0'): PServEntry; syscall SocketBase 240;
 
 procedure setnetent(Stayopen: Longint location 'd0');  syscall SocketBase 516;
 procedure endnetent; syscall SocketBase 522;
@@ -78,11 +78,11 @@ function getservent: PServEntry; syscall SocketBase 564;
 
 {$else AMIGAOS4}
 
-function fpgethostbyname(const Name: PChar): PHostEntry; syscall ISocket 196;
-function getnetbyname(Name: PChar): PNetEntry; syscall ISocket 204;
+function fpgethostbyname(const Name: PAnsiChar): PHostEntry; syscall ISocket 196;
+function getnetbyname(Name: PAnsiChar): PNetEntry; syscall ISocket 204;
 function getnetbyaddr(Net: Longint; NetType: Longint): PNetEntry; syscall ISocket 208;
-function getservbyname(Name: PChar; Protocol: PChar): PServEntry; syscall ISocket 212;
-function getservbyport(Port: LongInt; Protocol: PChar): PServEntry; syscall ISocket 216;
+function getservbyname(Name: PAnsiChar; Protocol: PAnsiChar): PServEntry; syscall ISocket 212;
+function getservbyport(Port: LongInt; Protocol: PAnsiChar): PServEntry; syscall ISocket 216;
 
 procedure setnetent(Stayopen: Longint);  syscall ISocket 456;
 procedure endnetent; syscall ISocket 460;
@@ -92,7 +92,7 @@ procedure endservent; syscall ISocket 484;
 function getservent: PServEntry; syscall ISocket 488;
 {$endif AMIGAOS4}
 
-function gethostbyname(Name: PChar): PHostEntry;
+function gethostbyname(Name: PAnsiChar): PHostEntry;
 begin
   if Assigned(SocketBase) then
     gethostbyname := fpgethostbyname(Name)
@@ -100,7 +100,7 @@ begin
     gethostbyname := nil;
 end;
 
-function gethostbyaddr(Addr: PChar; Len: Longint; HType: Longint): PHostentry;
+function gethostbyaddr(Addr: PAnsiChar; Len: Longint; HType: Longint): PHostentry;
 var
   addr1,
   addr2: in_addr;

packages/fcl-net/src/aros/resolve.inc

@@ -35,38 +35,38 @@ Type
 
   { THostEnt Object }
   THostEnt = record
-    H_Name     : pchar;   { Official name }
-    H_Aliases  : ppchar;  { Null-terminated list of aliases}
+    H_Name     : PAnsiChar;   { Official name }
+    H_Aliases  : PPAnsiChar;  { Null-terminated list of aliases}
     H_Addrtype : longint;   { Host address type }
     H_length  : longint;   { Length of address }
-    H_Addr : ppchar;    { null-terminated list of adresses }
+    H_Addr : PPAnsiChar;    { null-terminated list of adresses }
   end;
   PHostEntry = ^THostEnt;
 
   { TNetEnt object }
   TNetEnt = record
-    N_Name     : pchar;   { Official name }
-    N_Aliases  : ppchar;  { Nill-terminated alias list }
+    N_Name     : PAnsiChar;   { Official name }
+    N_Aliases  : PPAnsiChar;  { Nill-terminated alias list }
     N_AddrType : longint; { Net address type }
     N_net      : Cardinal; { Network number }
   end;
   PNetEntry = ^TNetEnt;
 
   TServEnt = record
-    s_name    : pchar;    { Service name }
-    s_aliases : ppchar;   { Null-terminated alias list }
+    s_name    : PAnsiChar;    { Service name }
+    s_aliases : PPAnsiChar;   { Null-terminated alias list }
     s_port    : longint;  { Port number }
-    s_proto   : pchar;    { Protocol to use }
+    s_proto   : PAnsiChar;    { Protocol to use }
   end;
   PServEntry = ^TServEnt;
 
 { C style calls, linked in from Libc }
 
-function fpgethostbyname(Name: PChar): PHostEntry; syscall SocketBase 35;
-function getnetbyname(Name: PChar): PNetEntry; syscall SocketBase 37;
+function fpgethostbyname(Name: PAnsiChar): PHostEntry; syscall SocketBase 35;
+function getnetbyname(Name: PAnsiChar): PNetEntry; syscall SocketBase 37;
 function getnetbyaddr(Net: Longint; NetType: Longint): PNetEntry; syscall SocketBase 38;
-function getservbyname(Name: PChar; Protocol: PChar): PServEntry; syscall SocketBase 39;
-function getservbyport(Port: LongInt; Protocol: PChar): PServEntry; syscall SocketBase 40;
+function getservbyname(Name: PAnsiChar; Protocol: PAnsiChar): PServEntry; syscall SocketBase 39;
+function getservbyport(Port: LongInt; Protocol: PAnsiChar): PServEntry; syscall SocketBase 40;
 
 procedure setnetent(Stayopen: Longint);  syscall SocketBase 86;
 procedure endnetent; syscall SocketBase 87;
@@ -76,7 +76,7 @@ procedure endservent; syscall SocketBase 93;
 function getservent: PServEntry; syscall SocketBase 94;
 
 
-function gethostbyname(Name: PChar): PHostEntry;
+function gethostbyname(Name: PAnsiChar): PHostEntry;
 begin
   if Assigned(SocketBase) then
     gethostbyname := fpgethostbyname(Name)
@@ -84,7 +84,7 @@ begin
     gethostbyname := nil;
 end;
 
-function gethostbyaddr(Addr: PChar; Len: Longint; HType: Longint): PHostentry;
+function gethostbyaddr(Addr: PAnsiChar; Len: Longint; HType: Longint): PHostentry;
 var
   addr1,
   addr2: in_addr;

packages/fcl-net/src/cnetdb.pp

@@ -190,11 +190,11 @@ type
  * use in system calls).
  *}
   hostent = record
-    h_name: PChar;      {/* official name of host *}
-    h_aliases: PPChar;  {* alias list *}
+    h_name: PAnsiChar;      {/* official name of host *}
+    h_aliases: PPAnsiChar;  {* alias list *}
     h_addrtype: cInt;   {* host address type *}
     h_length: cInt;     {* length of address *}
-    h_addr_list: PPChar;{* list of addresses from name server *}
+    h_addr_list: PPAnsiChar;{* list of addresses from name server *}
   end;
 
   THostEnt = hostent;
@@ -202,8 +202,8 @@ type
   PPHostEnt = ^PHostEnt;
 
   netent = record
-    n_name: PChar;      {* official name of net *}
-    n_aliases: PPChar;  {* alias list *}
+    n_name: PAnsiChar;      {* official name of net *}
+    n_aliases: PPAnsiChar;  {* alias list *}
     n_addrtype: cInt;   {* net address type *}
     n_net: cuInt32;     {* network # *}
   end;
@@ -212,18 +212,18 @@ type
   PPNetEnt = ^PNetEnt;
 
   servent = record
-    s_name: PChar;    {* official service name *}
-    s_aliases: PPChar;{* alias list *}
+    s_name: PAnsiChar;    {* official service name *}
+    s_aliases: PPAnsiChar;{* alias list *}
     s_port: cInt;     {* port # *}
-    s_proto: PChar;   {* protocol to use *}
+    s_proto: PAnsiChar;   {* protocol to use *}
   end;
   TServEnt = servent;
   PServEnt = ^TServEnt;
   PPServEnt = ^PServEnt;
 
   protoent = record
-    p_name: PChar; {* official protocol name *}
-    p_aliases: PPChar;  {* alias list *}
+    p_name: PAnsiChar; {* official protocol name *}
+    p_aliases: PPAnsiChar;  {* alias list *}
     p_proto: cInt;      {* protocol # *}
   end;
   TProtoEnt = protoent;
@@ -248,12 +248,12 @@ type
     ai_protocol: cInt;  {* 0 or IPPROTO_xxx for IPv4 and IPv6 *}
     ai_addrlen: TSocklen;  {* length of ai_addr *}
 {$ifdef FIRST_CANONNAME_THEN_ADDR}
-    ai_canonname: PChar;   {* canonical name for hostname *}
+    ai_canonname: PAnsiChar;   {* canonical name for hostname *}
     ai_addr: psockaddr;	   {* binary address *}
 {$endif}
 {$ifdef FIRST_ADDR_THEN_CANONNAME}
     ai_addr: psockaddr;	   {* binary address *}
-    ai_canonname: PChar;   {* canonical name for hostname *}
+    ai_canonname: PAnsiChar;   {* canonical name for hostname *}
 {$endif}
     ai_next: PAddrInfo;	   {* next structure in linked list *}
   end;
@@ -267,53 +267,53 @@ procedure endnetgrent; cdecl; external LIB_C name 'endnetgrent';
 procedure endprotoent; cdecl; external LIB_C name 'endprotoent';
 procedure endservent; cdecl; external LIB_C name 'endservent';
 procedure freehostent(ptr: PHostEnt); cdecl; external LIB_C name 'freehostent';
-function  gethostbyaddr(addr: PChar; len, typ: cInt): PHostEnt; cdecl; external LIB_C name 'gethostbyaddr';
+function  gethostbyaddr(addr: PAnsiChar; len, typ: cInt): PHostEnt; cdecl; external LIB_C name 'gethostbyaddr';
 
-function  gethostbyname(name: PChar): PHostEnt; cdecl; external LIB_C name 'gethostbyname';
+function  gethostbyname(name: PAnsiChar): PHostEnt; cdecl; external LIB_C name 'gethostbyname';
 
-function  gethostbyname2(name: PChar; af: cInt): PHostEnt; cdecl; external LIB_C name 'gethostbyname2';
+function  gethostbyname2(name: PAnsiChar; af: cInt): PHostEnt; cdecl; external LIB_C name 'gethostbyname2';
 
 function  gethostent: PHostEnt; cdecl; external LIB_C name 'gethostent';
 
 function getipnodebyaddr(src: Pointer; len: size_t; af: cInt; error_num: PcInt): PHostEnt; cdecl; external LIB_C name 'getipnodebyaddr';
 
-function getipnodebyname(name: PChar; af, flags: cInt; error_num: PcInt): PHostEnt; cdecl; external LIB_C name 'getipnodebyname';
+function getipnodebyname(name: PAnsiChar; af, flags: cInt; error_num: PcInt): PHostEnt; cdecl; external LIB_C name 'getipnodebyname';
 
 function getnetbyaddr(net: cint32; typ: cInt): PNetEnt; cdecl; external LIB_C name 'getnetbyaddr';
 
-function getnetbyname(name: PChar): PNetEnt; cdecl; external LIB_C name 'getnetbyname';
+function getnetbyname(name: PAnsiChar): PNetEnt; cdecl; external LIB_C name 'getnetbyname';
 
 function getnetent: PNetEnt; cdecl; external LIB_C name 'getnetent';
 
-function getnetgrent(host, user, domain: PPChar): cInt; cdecl; external LIB_C name 'getnetgrent';
+function getnetgrent(host, user, domain: PPAnsiChar): cInt; cdecl; external LIB_C name 'getnetgrent';
 
-function getprotobyname(name: PChar): PProtoEnt; cdecl; external LIB_C name 'getprotobyname';
+function getprotobyname(name: PAnsiChar): PProtoEnt; cdecl; external LIB_C name 'getprotobyname';
 
 function getprotobynumber(proto: cInt): PProtoEnt; cdecl; external LIB_C name 'getprotobynumber';
 
 function getprotoent: PProtoEnt; cdecl; external LIB_C name 'getprotoent';
 
-function getservbyname(name, proto: PChar): PServEnt; cdecl; external LIB_C name 'getservbyname';
+function getservbyname(name, proto: PAnsiChar): PServEnt; cdecl; external LIB_C name 'getservbyname';
 
-function getservbyport(port: cInt; proto: PChar): PServEnt; cdecl; external LIB_C name 'getservbyport';
+function getservbyport(port: cInt; proto: PAnsiChar): PServEnt; cdecl; external LIB_C name 'getservbyport';
 
 function  getservent: PServEnt; cdecl; external LIB_C name 'getservent';
-procedure herror(erstring: PChar); cdecl; external LIB_C name 'herror';
-function  hstrerror(err: cInt): PChar; cdecl; external LIB_C name 'hstrerror';
-function  innetgr(netgroup, host, user, domain: PChar): cInt; cdecl; external LIB_C name 'innetgr';
+procedure herror(erstring: PAnsiChar); cdecl; external LIB_C name 'herror';
+function  hstrerror(err: cInt): PAnsiChar; cdecl; external LIB_C name 'hstrerror';
+function  innetgr(netgroup, host, user, domain: PAnsiChar): cInt; cdecl; external LIB_C name 'innetgr';
 procedure sethostent(i: cInt); cdecl; external LIB_C name 'sethostent';
 
-{* void		sethostfile(const char *); *}
+{* void		sethostfile(const AnsiChar *); *}
 
 procedure setnetent(stayopen: cInt); cdecl; external LIB_C name 'setnetent';
 procedure setprotoent(stayopen: cInt); cdecl; external LIB_C name 'setprotoent';
-function  getaddrinfo(name, service: PChar; hints: PAddrInfo;
+function  getaddrinfo(name, service: PAnsiChar; hints: PAddrInfo;
                       res: PPAddrInfo): cInt; cdecl; external LIB_C name 'getaddrinfo';
-function  getnameinfo(sa: PSockAddr; salen: TSockLen; host: PChar; hostlen: TSize;
-                      serv: PChar; servlen: TSize; flags: cInt): cInt; cdecl; external LIB_C name 'getnameinfo';
+function  getnameinfo(sa: PSockAddr; salen: TSockLen; host: PAnsiChar; hostlen: TSize;
+                      serv: PAnsiChar; servlen: TSize; flags: cInt): cInt; cdecl; external LIB_C name 'getnameinfo';
 procedure freeaddrinfo(ai: PAddrInfo); cdecl; external LIB_C name 'freeaddrinfo';
-function  gai_strerror(ecode: cInt): PChar; cdecl; external LIB_C name 'gai_strerror';
-procedure setnetgrent(netgroup: PChar); cdecl; external LIB_C name 'setnetgrent';
+function  gai_strerror(ecode: cInt): PAnsiChar; cdecl; external LIB_C name 'gai_strerror';
+procedure setnetgrent(netgroup: PAnsiChar); cdecl; external LIB_C name 'setnetgrent';
 procedure setservent(stayopen: cInt); cdecl; external LIB_C name 'setservent';
 
 

packages/fcl-net/src/netdb.pp

@@ -362,6 +362,27 @@ uses
    BaseUnix,
    sysutils;
 
+Function AnsiToString(S : AnsiString) : String; inline;
+
+begin
+{$IF SIZEOF(CHAR)=2}
+  Result:=UTF8Decode(S);
+{$ELSE}
+  Result:=S;
+{$ENDIF}
+end;
+
+Function AnsiToString(P : PAnsiChar) : String;
+
+Var
+  S : AnsiString;
+begin
+  S:='';
+  if P<>Nil then
+    S:=P;
+  Result:=AnsiToString(S);
+end;
+
 {$ifndef FPC_USE_LIBC}
 type
   TTCPSocketResult = (srTimeout,srPartial,srSocketClose,srOK);
@@ -376,6 +397,7 @@ var
     Some Parsing routines
   ---------------------------------------------------------------------}
 
+
 Const 
   Whitespace = [' ',#9];
 
@@ -625,7 +647,7 @@ end;
 Function GetDNSServers: Integer;
 var
   i: integer;
-  s: string;
+  s,t: ansistring;
   H : THostAddr;
 begin
   if SystemApiLevel >= 26 then
@@ -643,7 +665,8 @@ begin
   SetLength(DNSServers, 9);
   for i:=1 to 9 do
     begin
-      s:=GetSystemProperty(PAnsiChar('net.dns' + IntToStr(i)));
+      t:='net.dns' + IntToStr(i);
+      s:=GetSystemProperty(PAnsiChar(T));
       if s = '' then
         break;
       H:=StrToNetAddr(s);
@@ -661,7 +684,7 @@ var
 
 Procedure CheckResolveFile;
 var
-  n, v: string;
+  n, v: ansistring;
 begin
   if not CheckResolveFileAge then
     exit;
@@ -2182,7 +2205,7 @@ begin
     // Fill the cached DefaultDomainListArr and NDots
     if (Length(DefaultDomainListArr) = 0) then
       begin
-      DefaultDomainListArr := DefaultDomainList.Split(' ',Char(9));
+      DefaultDomainListArr := DefaultDomainList.Split(Char(' '),Char(9));
       L := Pos('ndots:', DNSOptions);
       if L > 0 then
         NDots := StrToIntDef(Trim(Copy(DNSOptions, L+6, 2)), 1);
@@ -2642,6 +2665,7 @@ Function ResolveName(const HostName : String; Addresses: pointer; MaxAddresses,
 var
   h: TAddrInfo;
   res, ai: PAddrInfo;
+  A : AnsiString;
 begin
   Result:=-1;
   if MaxAddresses = 0 then
@@ -2650,7 +2674,8 @@ begin
   h.ai_family:=Family;
   h.ai_socktype:=SOCK_STREAM;
   res:=nil;
-  if (getaddrinfo(PChar(HostName), nil, @h, @res) <> 0) or (res = nil) then
+  A:=HostName;
+  if (getaddrinfo(PAnsiChar(A), nil, @h, @res) <> 0) or (res = nil) then
     exit;
   Result:=0;
   ai:=res;
@@ -2691,7 +2716,7 @@ begin
   n:='';
   SetLength(n, NI_MAXHOST);
   if getnameinfo(Addr, AddrLen, @n[1], Length(n), nil, 0, 0) = 0 then begin
-    Names[Low(Names)]:=PAnsiChar(n);
+    Names[Low(Names)]:=AnsiToString(n);
     Result:=1;
   end;
 end;
@@ -2792,7 +2817,7 @@ begin
   Result:=False;
 end;
 
-function PPCharToString(list: PPChar): string;
+function PPCharToString(list: PPAnsiChar): Ansistring;
 begin
   Result:='';
   if list = nil then
@@ -2809,13 +2834,16 @@ end;
 Function GetNetworkByName(const NetName: String; Var N : TNetworkEntry) : boolean;
 var
   ne: PNetEnt;
+  A : AnsiString;
+  
 begin
-  ne:=getnetbyname(PAnsiChar(NetName));
+  A:=NetName;
+  ne:=getnetbyname(PAnsiChar(A));
   Result:=ne <> nil;
   if Result then begin
-    N.Name:=ne^.n_name;
+    N.Name:=AnsiToString(ne^.n_name);
     N.Addr.s_addr:=ne^.n_net;
-    N.Aliases:=PPCharToString(ne^.n_aliases);
+    N.Aliases:=AnsiToString(PPCharToString(ne^.n_aliases));
   end;
 end;
 
@@ -2835,13 +2863,16 @@ end;
 Function GetServiceByName(Const Name,Proto : String; Var E : TServiceEntry) : Boolean;
 var
   se: PServEnt;
+  A,B : AnsiString;
 begin
-  se:=getservbyname(PAnsiChar(Name), PAnsiChar(Proto));
+  A:=Name;
+  B:=Proto;
+  se:=getservbyname(PAnsiChar(A), PAnsiChar(B));
   Result:=se <> nil;
   if Result then begin
-    E.Name:=se^.s_name;
+    E.Name:=AnsiToString(se^.s_name);
     E.Port:=NToHs(se^.s_port);
-    E.Protocol:=se^.s_proto;
+    E.Protocol:=AnsiToString(se^.s_proto);
     E.Aliases:=PPCharToString(se^.s_aliases);
   end;
 end;
@@ -2849,8 +2880,11 @@ end;
 Function GetServiceByPort(Port : Word;Const Proto : String; Var E : TServiceEntry) : Boolean;
 var
   se: PServEnt;
+  A : AnsiString;
+  
 begin
-  se:=getservbyport(htons(Port), PAnsiChar(Proto));
+  A:=Proto;
+  se:=getservbyport(htons(Port), PAnsiChar(A));
   Result:=se <> nil;
   if Result then begin
     E.Name:=se^.s_name;
@@ -2863,13 +2897,15 @@ end;
 Function GetProtocolByName(const ProtoName: String;  Var H : TProtocolEntry) : boolean;
 var
   pe: PProtoEnt;
+  A : AnsiString;
 begin
-  pe:=getprotobyname(PAnsiChar(ProtoName));
+  A:=ProtoName;
+  pe:=getprotobyname(PAnsiChar(A));
   Result:=pe <> nil;
   if Result then begin
-    H.Name:=pe^.p_name;
+    H.Name:=AnsiToString(pe^.p_name);
     H.Number:=pe^.p_proto;
-    h.Aliases:=PPCharToString(pe^.p_aliases);
+    h.Aliases:=AnsiToString(PPCharToString(pe^.p_aliases));
   end;
 end;
 
@@ -2880,9 +2916,9 @@ begin
   pe:=getprotobynumber(proto);
   Result:=pe <> nil;
   if Result then begin
-    H.Name:=pe^.p_name;
+    H.Name:=AnsiToString(pe^.p_name);
     H.Number:=pe^.p_proto;
-    h.Aliases:=PPCharToString(pe^.p_aliases);
+    h.Aliases:=AnsiToString(PPCharToString(pe^.p_aliases));
   end;
 end;
 

packages/fcl-net/src/os2/resolve.inc

@@ -33,28 +33,28 @@ Type
 
   { THostEnt Object }
   THostEnt = record
-    H_Name     : pchar;   { Official name }
-    H_Aliases  : ppchar;  { Null-terminated list of aliases}
+    H_Name     : PAnsiChar;   { Official name }
+    H_Aliases  : PPAnsiChar;  { Null-terminated list of aliases}
     H_Addrtype : longint;   { Host address type }
     H_length  : longint;   { Length of address }
-    H_Addr : ppchar;    { null-terminated list of adresses }
+    H_Addr : PPAnsiChar;    { null-terminated list of adresses }
   end;
   PHostEntry = ^THostEnt;
 
   { TNetEnt object }
   TNetEnt = record
-    N_Name     : pchar;   { Official name }
-    N_Aliases  : ppchar;  { Nill-terminated alias list }
+    N_Name     : PAnsiChar;   { Official name }
+    N_Aliases  : PPAnsiChar;  { Nill-terminated alias list }
     N_AddrType : longint; { Net address type }
     N_net      : Cardinal; { Network number }
   end;
   PNetEntry = ^TNetEnt;
 
   TServEnt = record
-    s_name    : pchar;    { Service name }
-    s_aliases : ppchar;   { Null-terminated alias list }
+    s_name    : PAnsiChar;    { Service name }
+    s_aliases : PPAnsiChar;   { Null-terminated alias list }
     s_port    : longint;  { Port number }
-    s_proto   : pchar;    { Protocol to use }
+    s_proto   : PAnsiChar;    { Protocol to use }
   end;
   PServEntry = ^TServEnt;
 
@@ -72,11 +72,11 @@ procedure setservent (StayOpen : longint); cdecl; external socklib index 25;
 procedure endservent; cdecl; external socklib index 26;
 
 function getnetbyaddr ( Net : Longint; nettype : Longint) : PNetEntry; cdecl; external socklib index 14;
-function gethostbyname ( Name : Pchar) : PHostEntry; cdecl; external socklib index 11;
-function gethostbyaddr ( Addr : PChar; Len : Longint; HType : Longint) : PHostentry ; cdecl; external socklib index 12;
-function getnetbyname ( Name : pchar) : PNetEntry; cdecl; external socklib index 13;
-function getservbyname (name : pchar  ; protocol : pchar) : PServEntry; cdecl; external socklib index 24;
-function getservbyport (port : longint; protocol : pchar) : PServEntry; cdecl; external socklib index 23;
+function gethostbyname ( Name : PAnsiChar) : PHostEntry; cdecl; external socklib index 11;
+function gethostbyaddr ( Addr : PAnsiChar; Len : Longint; HType : Longint) : PHostentry ; cdecl; external socklib index 12;
+function getnetbyname ( Name : PAnsiChar) : PNetEntry; cdecl; external socklib index 13;
+function getservbyname (name : PAnsiChar  ; protocol : PAnsiChar) : PServEntry; cdecl; external socklib index 24;
+function getservbyport (port : longint; protocol : PAnsiChar) : PServEntry; cdecl; external socklib index 23;
 
 function  GetDNSError : LongInt;
 begin

packages/fcl-net/src/resolve.pp

@@ -61,7 +61,7 @@ Type
   Protected
     Procedure CheckOperation(const Msg : String);
     Function NameLookup(Const S : String) : Boolean; virtual;
-    Procedure SaveAliases(P : PPChar);
+    Procedure SaveAliases(P : PPAnsiChar);
   Public
     Constructor Create(AOwner : TComponent); override;
     Destructor Destroy; override;
@@ -261,7 +261,7 @@ begin
   Result:=True;
 end;
 
-Procedure TResolver.SaveAliases(P : PPChar);
+Procedure TResolver.SaveAliases(P : PPAnsiChar);
 
 Var
   I : Integer;
@@ -372,7 +372,7 @@ begin
   Result:=Inherited NameLookup(S);
   If Result then
     begin
-    FHostEntry:=GetHostByName(pchar(FName));
+    FHostEntry:=GetHostByName(PAnsiChar(FName));
     Result:=FHostEntry<>Nil;
     If Result then
       SaveHostEntry(FHostEntry)
@@ -415,7 +415,7 @@ Var
 
 begin
   ClearData;
-  FHostEntry:=GetHostByAddr(Pchar(@Address),SizeOf(Address),AF_INET);
+  FHostEntry:=GetHostByAddr(PAnsiChar(@Address),SizeOf(Address),AF_INET);
   Result:=FHostEntry<>Nil;
   If Result then
     SaveHostEntry(FHostEntry)
@@ -494,7 +494,7 @@ begin
   Result:=Inherited NameLookup(S);
   If Result then
     begin
-    FNetEntry:=GetNetByName(pchar(S));
+    FNetEntry:=GetNetByName(PAnsiChar(S));
     Result:=FNetEntry<>Nil;
     If Result then
       SaveNetEntry(FNetEntry)
@@ -631,9 +631,9 @@ begin
   FName:=S;
   FProtocol:=Proto;
   If (proto='') then
-    FServiceEntry:=GetServByName(pchar(S),Nil)
+    FServiceEntry:=GetServByName(PAnsiChar(S),Nil)
   else
-    FServiceEntry:=GetServByName(pchar(S),PChar(FProtocol));
+    FServiceEntry:=GetServByName(PAnsiChar(S),PAnsiChar(FProtocol));
   Result:=FServiceEntry<>Nil;
   If Result then
     SaveServiceEntry(FServiceEntry)
@@ -656,7 +656,7 @@ begin
   If (Proto='') then
     FServiceEntry:=GetServByPort(APort,Nil)
   else
-    FServiceEntry:=GetServByPort(APort,pchar(Proto));
+    FServiceEntry:=GetServByPort(APort,PAnsiChar(Proto));
   Result:=FServiceEntry<>Nil;
   If Result then
     SaveServiceEntry(FServiceEntry)

packages/fcl-net/src/unix/resolve.inc

@@ -36,28 +36,28 @@ Type
 
   { THostEnt Object }
   THostEnt = record
-    H_Name     : pchar;   { Official name }
-    H_Aliases  : ppchar;  { Null-terminated list of aliases}
+    H_Name     : PAnsiChar;   { Official name }
+    H_Aliases  : PPAnsiChar;  { Null-terminated list of aliases}
     H_Addrtype : longint;   { Host address type }
     H_length  : longint;   { Length of address }
-    H_Addr : ppchar;    { null-terminated list of adresses }
+    H_Addr : PPAnsiChar;    { null-terminated list of adresses }
   end;
   PHostEntry = ^THostEnt;
 
   { TNetEnt object }
   TNetEnt = record
-    N_Name     : pchar;   { Official name }
-    N_Aliases  : ppchar;  { Nill-terminated alias list }
+    N_Name     : PAnsiChar;   { Official name }
+    N_Aliases  : PPAnsiChar;  { Nill-terminated alias list }
     N_AddrType : longint; { Net address type }
     N_net      : Cardinal; { Network number }
   end;
   PNetEntry = ^TNetEnt;
 
   TServEnt = record
-    s_name    : pchar;    { Service name }
-    s_aliases : ppchar;   { Null-terminated alias list }
+    s_name    : PAnsiChar;    { Service name }
+    s_aliases : PPAnsiChar;   { Null-terminated alias list }
     s_port    : longint;  { Port number }
-    s_proto   : pchar;    { Protocol to use }
+    s_proto   : PAnsiChar;    { Protocol to use }
   end;
   PServEntry = ^TServEnt;
 
@@ -76,11 +76,11 @@ procedure setservent (StayOpen : longint); cdecl; external socklib;
 procedure endservent; cdecl; external socklib;
 
 function getnetbyaddr ( Net : Longint; nettype : Longint) : PNetEntry; cdecl; external socklib;
-function gethostbyname ( Name : Pchar) : PHostEntry; cdecl; external socklib;
-function gethostbyaddr ( Addr : PChar; Len : Longint; HType : Longint) : PHostentry ; cdecl; external socklib;
-function getnetbyname ( Name : pchar) : PNetEntry; cdecl; external socklib;
-function getservbyname (name : pchar  ; protocol : pchar) : PServEntry; cdecl; external socklib;
-function getservbyport (port : longint; protocol : pchar) : PServEntry; cdecl; external socklib;
+function gethostbyname ( Name : PAnsiChar) : PHostEntry; cdecl; external socklib;
+function gethostbyaddr ( Addr : PAnsiChar; Len : Longint; HType : Longint) : PHostentry ; cdecl; external socklib;
+function getnetbyname ( Name : PAnsiChar) : PNetEntry; cdecl; external socklib;
+function getservbyname (name : PAnsiChar  ; protocol : PAnsiChar) : PServEntry; cdecl; external socklib;
+function getservbyport (port : longint; protocol : PAnsiChar) : PServEntry; cdecl; external socklib;
 
 function  GetDNSError : libcint;
 

packages/fcl-net/src/win/resolve.inc

@@ -23,7 +23,7 @@ Type
 Const
   DNSErr : Integer = 0;
 
-function getnetbyname ( Name : pchar) : PNetEntry;
+function getnetbyname ( Name : PAnsiChar) : PNetEntry;
 
 begin
   DNSErr:=-1;