Merged revisions 7166,7174 via svnmerge from

svn+ssh://[email protected]/FPC/svn/fpc/trunk

........
r7166 | michael | 2007-04-23 22:31:08 +0200 (Mon, 23 Apr 2007) | 1 line

* Fixed GetDeclaration of TPasFileType
........
r7174 | Almindor | 2007-04-26 13:13:13 +0200 (Thu, 26 Apr 2007) | 2 lines

* update lnet to 0.5 release

........

git-svn-id: branches/fixes_2_2@7228 -

packages/fcl-passrc/src/pastree.pp

@@ -1128,9 +1128,9 @@ end;
 
 function TPasFileType.GetDeclaration (full : boolean) : string;
 begin
-  Result:='File of ';
+  Result:='File';
   If Assigned(Eltype) then
-    Result:=Result+ElType.Name;
+    Result:=Result+' of '+ElType.Name;
   If Full Then
     Result:=Name+' = '+Result;
 end;

utils/fppkg/lnet/lnet.pp

@@ -567,7 +567,7 @@ end;
 
 function TLSocket.GetPeerPort: Word;
 begin
-  Result := FPeerAddress.sin_port;
+  Result := ntohs(FPeerAddress.sin_port);
 end;
 
 function TLSocket.Listen(const APort: Word; const AIntf: string = LADDR_ANY): Boolean;
@@ -910,7 +910,7 @@ begin
     FillAddressInfo(FRootSock.FPeerAddress, AF_INET, s, p);
   end else
     FillAddressInfo(FRootSock.FPeerAddress, AF_INET, Address,
-                                            FRootSock.FPeerAddress.Port);
+                                            FRootSock.PeerPort);
 end;
 
 function TLUdp.InitSocket(aSocket: TLSocket): TLSocket;