paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-09 16:49:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Better solution for last commit, correct sockets definitions in implementation

Browse Source
This commit is contained in:
Michaël Van Canneyt 2022-09-20 17:03:45 +02:00
parent dcc0b706bc
commit 2cbc6bb674
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
packages/fcl-net/src/ssockets.pp
View File

@ -17,13 +17,6 @@ unit ssockets;
interface
uses
// This must be here, to prevent it from overriding the sockets definitions... :/
{$ifdef unix}
BaseUnix,Unix,
{$endif}
{$ifdef windows}
winsock2, windows,
{$endif}
SysUtils, Classes, ctypes, sockets;
type
@ -336,6 +329,13 @@ type
Implementation
uses
// This must be here, to prevent it from overriding the sockets definitions... :/
{$ifdef unix}
BaseUnix,Unix,
{$endif}
{$ifdef windows}
winsock2, windows,
{$endif}
resolve;
Const
@ -768,7 +768,7 @@ begin
Result:=FHandler.Send(Buffer,Count);
end;
function TSocketStream.GetLocalAddress: TSockAddr;
function TSocketStream.GetLocalAddress: sockets.TSockAddr;
var
len: LongInt;
begin
@ -777,7 +777,7 @@ begin
FillChar(Result, SizeOf(Result), 0);
end;
function TSocketStream.GetRemoteAddress: TSockAddr;
function TSocketStream.GetRemoteAddress: sockets.TSockAddr;
var
len: LongInt;
begin